Fixed merge conflicts

Created initial data structures for HARQ
Following changes are made: 1) Added essential data structures for HARQ 2) Moved gNB specific list functions to common file 3) Implemented preconfigurations for HARQ 4) Developed thread lock functions for NR_UE_SL_SCHED 5) Included header files for common moved functions in gNB code
2026-07-19 15:40:30 +00:00 · 2024-08-02 02:14:49 +00:00 · 2024-07-31 15:38:21 +00:00 · 2024-07-31 15:37:55 +00:00 · 2024-07-31 15:37:18 +00:00 · 2024-07-31 15:37:00 +00:00
1169 changed files with 85543 additions and 111423 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -60,8 +60,6 @@ ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
-  - RB_FOREACH
-  - UE_iterator
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,8 @@ cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/

-# IDE files
+# vscode
 .vscode
-.cproject
-.project
-.settings

 # Tags for vim/global
 GPATH
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "openair2/E2AP/flexric"]
 	path = openair2/E2AP/flexric
 	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
-	branch = remotes/origin/service-models-integration
+	branch = remotes/origin/mir_dev
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/cmake_targets/ran_build/build/lte-softmodem",
+            "args": [
+                "-O", "../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf",
+                "--noS1"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/cmake_targets",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "miDebuggerPath": "${workspaceFolder}/cmake_targets/sudo-gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,5 @@
 # RELEASE NOTES: #

-## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##
-
-This release adds support for 5G and maintains previous features:
-* 5G SA in gNB
-  - PHY, MAC, RLC, PDCP, SDAP, RRC layers
-  - 2x2 MIMO and 256-QAM for UL/DL
-  - 15 and 30 kHz subcarrier spacings; 10-100 MHz bandwidths
-  - Up to 800Mbps throughput or 5ms latency
-  - F1, basic E1, 5G FAPI (SCF 222.10.02), split 8 split options
-  - Handling of up to 16 UEs
-  - RRC procedures for connection setup, multiple PDU sessions, reestablishment
-* 5G SA in UE
-  - PHY, MAC, RLC, PDCP, SDAP, RRC layers
-  - 2x2 MIMO and 256-QAM for UL/DL
-  - 15 and 30 kHz subcarrier spacings; 10-100 MHz bandwidths
-  - Custom FAPI-like MAC/PHY interface
-  - RRC procedures for connection setup and cell measurement
-* Basic 5G NSA in gNB
-  - X2 sgNB Addition Request between OAI eNB and gNB
-* 4G eNB and UE
-  - Bugfixes in fairRR scheduler (eNB)
-  - Non-standard F1 midhaul removed (eNB)
-  - FlexRAN removed (eNB)
-  - Sync fixes (UE)
-* LTE-M supported
-* Support for AW2S devices, RFsimulator channel emulation support
-
-For more information on supported features, please refer to the [feature set](doc/FEATURE_SET.md).
-
 ## [v1.2.1](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v1.2.1) -> February 2020. ##

 * Bug fix for mutex lock for wake-up signal
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,23 +102,21 @@ add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of bui
 # in case /proc/cpuinfo exists we want to inspect available Intrinsics
 # -so not to go always through SIMDE emulation
 # -so to avoid AVX512 instructions generation by gcc   
-if(EXISTS "/proc/cpuinfo" AND NOT CROSS_COMPILE)
+execute_process(COMMAND uname -m OUTPUT_VARIABLE CPUARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "CPUARCH ${CPUARCH}")
+if(EXISTS "/proc/cpuinfo")
  file(STRINGS "/proc/cpuinfo" CPUFLAGS REGEX flags LIMIT_COUNT 1)
 else()
  message(WARNING "did not find /proc/cpuinfo -- not setting any x86-specific compilation variables")
 endif()
- 
+
 eval_boolean(AUTODETECT_AVX512 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx512")
 add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is available on the host processor" ON)

 eval_boolean(AUTODETECT_AVX2 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx2")
 add_boolean_option(AVX2 ${AUTODETECT_AVX2} "Whether AVX2 intrinsics is available on the host processor" ON)

-message(STATUS "CPU architecture is ${CMAKE_SYSTEM_PROCESSOR}")
-if (CROSS_COMPILE)
-  message(STATUS "setting as aarch64")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
-elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(${CPUARCH} STREQUAL "x86_64" AND DEFINED CPUFLAGS)
  # The following intrinsics are assumed to be available on any x86 system
  # (avx, f16c, fma, gnfi, mmx, pclmul, sse, sse2, sse3, xop)
  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
@@ -141,19 +139,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
  if(CPUINFO MATCHES "ssse3")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
  endif()
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mfloat-abi=hard -mfpu=neon -lgcc -lrt")
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
-else()
-  message(FATAL_ERROR "compile for CPU architecture ${CPUARCH}, CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
+elseif(${CPUARCH} NOT STREQUAL "x86_64")
+  message(FATAL_ERROR "Cannot compile for CPU architecture ${CPUARCH}")
 endif()

-if (NOT CROSS_COMPILE)
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
-else ()
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8-a")
-endif()
+set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")

 # add autotools definitions that were maybe used!
 add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")
@@ -173,8 +163,8 @@ set(CMAKE_CXX_FLAGS

 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
 if (SANITIZE_ADDRESS)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
  # There seems to be some incompatibility with pthread_create and the RT scheduler, which
  # results in pthread_create hanging.
  #
@@ -193,13 +183,6 @@ if (SANITIZE_ADDRESS)
  # wrong in the pthread library, or something subtly wrong in this CMakeLists.txt. Use Ubuntu 20.04 instead.
 endif ()

-add_boolean_option(SANITIZE_THREAD False "enable the address sanitizer (TSan)" ON)
-if (SANITIZE_THREAD)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-endif()
-
 add_boolean_option(SANITIZE_UNDEFINED False "enable the undefined behavior sanitizer (UBSan)" ON)
 if (SANITIZE_UNDEFINED)
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
@@ -273,11 +256,8 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")

 # Debug related options
 #########################################
-add_boolean_option(DEBUG_ASN1 False "Enable ASN1 debug logs" OFF)
-# asn1c skeletons have hardcoded this flag to make customized debug logs
-# OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
-# see common/utils/config.h
-add_boolean_option(TRACE_ASN1C_ENC_DEC OFF "Enable ASN1 encoder/decoder debug traces via OAI logging system" ON)
+add_boolean_option(DEBUG_ASN1      False "ASN1 coder/decoder Debug" OFF)
+#add_boolean_option(DEBUG_MAC_INTERFACE False "print MAC-RLC PDU exchange to stdout") # if true, make sure that global and PDCP log levels are trace, not found in code, commented out, to be removed
 add_boolean_option(T_TRACER            True  "Activate the T tracer, a debugging/monitoring framework" ON)
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs" ON)
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
@@ -287,6 +267,12 @@ set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

+# asn1c skeletons have hardcoded this flag to make customized debug logs
+# OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
+if (DEBUG_ASN1C)
+  add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 # asn1c skeletons need this
 add_definitions(-DHAVE_NETINET_IN_H)

@@ -296,15 +282,6 @@ add_definitions(-DHAVE_NETINET_IN_H)
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")

-set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
-set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
-message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")
-
-set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
-set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
-message(STATUS "Selected KPM Version: ${KPM_VERSION}")
-
-
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -439,7 +416,6 @@ target_link_libraries(x2ap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 set(F1AP_DIR ${OPENAIR2_DIR}/F1AP)
 add_library(f1ap
            ${F1AP_DIR}/f1ap_common.c
-            ${F1AP_DIR}/f1ap_ids.c
            ${F1AP_DIR}/f1ap_cu_interface_management.c
            ${F1AP_DIR}/f1ap_cu_paging.c
            ${F1AP_DIR}/f1ap_cu_rrc_message_transfer.c
@@ -458,7 +434,7 @@ add_library(f1ap
            ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc)

 # LPP
 ##############
@@ -470,23 +446,19 @@ 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
-  ${CONFIG_ROOTDIR}/config_common.c
-)
-
 add_library(CONFIG_LIB
  ${CONFIG_ROOTDIR}/config_load_configmodule.c
  ${CONFIG_ROOTDIR}/config_userapi.c
  ${CONFIG_ROOTDIR}/config_cmdline.c
 )
-target_link_libraries(CONFIG_LIB PRIVATE config_internals dl UTIL)

 # CONFIG_LIB is a wrapper around a particular config implementation, default is
 # libconfig in params_libconfig below
 pkg_check_modules(libconfig REQUIRED libconfig)
+target_link_libraries(CONFIG_LIB PRIVATE dl UTIL)
 add_library(params_libconfig MODULE ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c)
 target_include_directories(params_libconfig PRIVATE ${libconfig_INCLUDE_DIRS})
-target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBRARIES})
+target_link_libraries(params_libconfig PRIVATE ${libconfig_LIBRARIES})

 # shared library loader
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
@@ -494,21 +466,20 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)

 ##########################################################

-# LDPC offload library - AMD T2 Accelerator Card
+# LDPC offload library
 ##########################################################

-add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
-set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
-if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
-  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
+add_boolean_option(ENABLE_LDPC_T1 OFF "Build support for LDPC Offload to T1 library" OFF)
+if (ENABLE_LDPC_T1)
+  pkg_check_modules(LIBDPDK_T1 REQUIRED libdpdk=20.05.0)
+  find_library(T1 NAMES rte_pmd_hpac_sdfec_pmd REQUIRED)
+  if (NOT T1)
+    message(FATAL_ERROR "Library rte_pmd_hpac_sdfec_pmd for T1 offload not found")
  endif()
-  message(STATUS "T2 build: use ${PMD_T2}")
-  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
-  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
+  add_library(ldpc_t1 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_t1 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_compile_options(ldpc_t1 PRIVATE ${LIBDPDK_T1_CFLAGS})
+  target_link_libraries(ldpc_t1 ${LIBDPDK_T1_LDFLAGS} ${T1})
 endif()

 ##########################################################
@@ -655,7 +626,7 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/time_meas.c
  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread)
+target_link_libraries(UTIL PUBLIC ${T_LIB})

 set(SECURITY_SRC
  ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -718,6 +689,7 @@ target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
@@ -820,30 +792,19 @@ set(PHY_LDPC_ORIG_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
 )
-add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
-target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)

 set(PHY_LDPC_OPTIM_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
-  )
-add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
-target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
-
+)
 set(PHY_LDPC_OPTIM8SEG_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
 )
-add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
-target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
-
 set(PHY_LDPC_OPTIM8SEGMULTI_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-  )
-add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-
+)
 set(PHY_LDPC_CUDA_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
@@ -857,13 +818,21 @@ add_custom_target( nrLDPC_decoder_kernels_CL
                   COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc
                   SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
 )
+
+set(PHY_NR_CODINGIF
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c;
+)
+
+add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
+target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
+add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
+target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
+add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
+target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
 add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
 target_link_libraries(ldpc_cl OpenCL)
 add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)

-set(PHY_NR_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
-)

 ##############################################
 # Base CUDA setting
@@ -881,9 +850,16 @@ if (ENABLE_LDPC_CUDA)
  endif()
 endif()

+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
+
+add_library(ldpc_parityCheck MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_compile_definitions(ldpc_parityCheck PUBLIC NR_LDPC_ENABLE_PARITY_CHECK)
+target_link_libraries(ldpc_parityCheck  PRIVATE ldpc_gen_HEADERS)
+
 add_library(coding MODULE ${PHY_TURBOSRC} )

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


 set(PHY_SRC_COMMON
@@ -1057,7 +1033,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_freq_equalization.c
  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
@@ -1086,8 +1061,19 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psfch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pscch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1107,11 +1093,14 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
  ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
  ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
 # ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
@@ -1137,17 +1126,17 @@ if (${SMBV})
 endif  (${SMBV})

 set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)

 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
 add_dependencies(PHY_COMMON dfts)
 target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)

 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)
+#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)
@@ -1162,7 +1151,6 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 add_library(PHY_NR ${PHY_NR_SRC})

 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs)

 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
@@ -1214,6 +1202,18 @@ set(RLC_V2
  ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_sdu.c
  )

+set(NR_RLC_SRC
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/asn1_utils.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_am.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_tm.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_um.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_oai_api.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_pdu.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_sdu.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_ue_manager.c
+  )
+
 set(NR_PDCP_SRC
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
@@ -1224,10 +1224,6 @@ set(NR_PDCP_SRC
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
-  openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_if.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_direct.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
  )

 set(NR_SDAP_SRC
@@ -1275,10 +1271,12 @@ set(L2_LTE_SRC
  )

 set(L2_NR_SRC
+  ${NR_RLC_SRC}
  ${NR_PDCP_SRC}
  ${NR_SDAP_SRC}
  ${NR_RRC_DIR}/rrc_gNB.c
  ${NR_RRC_DIR}/nr_rrc_common.c
+  ${NR_RRC_DIR}/L2_nr_interface.c
  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
  ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
  ${NR_RRC_DIR}/nr_rrc_config.c
@@ -1288,8 +1286,6 @@ set(L2_NR_SRC
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${NR_RRC_DIR}/rrc_gNB_NGAP.c
  ${NR_RRC_DIR}/rrc_gNB_radio_bearers.c
-  ${NR_RRC_DIR}/rrc_gNB_cuup.c
-  ${NR_RRC_DIR}/rrc_gNB_du.c
  )

 set(L2_SRC_UE
@@ -1313,6 +1309,7 @@ set(L2_RRC_SRC_UE
  )

 set(NR_L2_SRC_UE
+  ${NR_RLC_SRC}
  ${NR_PDCP_SRC}
  ${NR_SDAP_SRC}
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
@@ -1370,7 +1367,7 @@ set (MAC_NR_SRC


 set (MAC_SRC_UE
-  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
+	#  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${MAC_DIR}/main_ue.c
  ${MAC_DIR}/ue_procedures.c
@@ -1384,13 +1381,17 @@ set (MAC_NR_SRC_UE
  ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
  ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
  ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue_sl.c
  ${NR_UE_MAC_DIR}/mac_vars.c
  ${NR_UE_MAC_DIR}/main_ue_nr.c
  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_sci_slsch.c
+  ${NR_UE_MAC_DIR}/nr_slsch_scheduler.c
 )

 set (ENB_APP_SRC
@@ -1431,14 +1432,15 @@ add_library(L2
  )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-
 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_link_libraries(L2 PUBLIC e2_agent e2_ran_func)
  target_compile_definitions(L2 PRIVATE E2_AGENT)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()


+add_library(MAC_NR ${MAC_NR_SRC})
+target_link_libraries(MAC_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

@@ -1458,13 +1460,19 @@ add_library(e1_if

 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)

-target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
+add_library(e1_pdcp_if
+  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
+  )
+
+target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap)
 if(E2_AGENT)
-  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()

+
 add_library(L2_LTE_NR
  ${L2_RRC_SRC}
  ${MAC_SRC}
@@ -1493,7 +1501,7 @@ endif()
 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)

 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
-target_link_libraries(NR_L2_UE PRIVATE f1ap nr_rlc)
+target_link_libraries(NR_L2_UE PRIVATE f1ap)
 target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(MAC_NR_COMMON
@@ -1687,7 +1695,7 @@ set(libnas_ies_OBJS

 set (libnas_utils_OBJS
  ${NAS_SRC}COMMON/UTIL/device.c
-  common/utils/mem/memory.c
+  ${NAS_SRC}COMMON/UTIL/memory.c
  ${NAS_SRC}COMMON/UTIL/nas_timer.c
  ${NAS_SRC}COMMON/UTIL/socket.c
  ${NAS_SRC}COMMON/UTIL/stty.c
@@ -1887,6 +1895,8 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
+target_link_libraries(SIMU PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(SIMU PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})

 # Qt-based scope
 add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
@@ -1982,7 +1992,6 @@ target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 if(E2_AGENT)
  target_compile_definitions(lte-softmodem PRIVATE E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()

 add_executable(oairu
@@ -2052,6 +2061,7 @@ add_executable(nr-softmodem
  ${rrc_h}
  ${nr_rrc_h}
  ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-gnb.c
  ${OPENAIR_DIR}/executables/nr-ru.c
  ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2078,16 +2088,11 @@ target_link_libraries(nr-softmodem PRIVATE
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
-endif()
-

 add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)

-if (ENABLE_LDPC_T2)
-  add_dependencies(nr-softmodem ldpc_t2)
+if (ENABLE_LDPC_T1)
+  add_dependencies(nr-softmodem ldpc_t1)
 endif()

 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2110,13 +2115,9 @@ add_executable(nr-cuup

 target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap f1ap SIMU_ETH
+                      GTPV1U e1ap e1_pdcp_if f1ap SIMU_ETH
                      z sctp 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)
-  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
                     
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2124,6 +2125,7 @@ endif()
 add_executable(nr-uesoftmodem
  ${rrc_h}
  ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2211,12 +2213,12 @@ add_executable(ldpctest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
   )

-add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
+add_dependencies( ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_parityCheck)
 if (ENABLE_LDPC_CUDA)
  add_dependencies(ldpctest ldpc_cuda)
 endif()
 target_link_libraries(ldpctest PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON -Wl,--end-group
  m pthread dl shlib_loader ${T_LIB}
  )

@@ -2242,6 +2244,24 @@ target_link_libraries(nr_pbchsim PRIVATE
 )
 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
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
+  ${T_SOURCE}
+  ${SHLIB_LOADER_SOURCES}
+  )
+target_link_libraries(nr_psbchsim PRIVATE
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl shlib_loader
+  )
+target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
@@ -2267,7 +2287,7 @@ add_executable(nr_dlsim
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU SIMU_ETH 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
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR 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
  )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2306,12 +2326,12 @@ add_executable(nr_ulsim
  ${PHY_INTERFACE_DIR}/queue_t.c
  )

-if (ENABLE_LDPC_T2)
-  add_dependencies(nr_ulsim ldpc_t2)
+if (ENABLE_LDPC_T1)
+  add_dependencies(nr_ulsim ldpc_t1)
 endif()

 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU SIMU_ETH 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
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR 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
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2373,9 +2393,9 @@ if (${T_TRACER})
        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
-        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
+        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR ngap
        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals)
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc dfts)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
    endif()
@@ -2441,6 +2461,9 @@ make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
 # user space tool for configuring MESH IP driver
 ################
 add_executable(rb_tool
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/constant.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/ioctl.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
@@ -2464,16 +2487,6 @@ make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})

 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)

-set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
-set_property(CACHE ENABLE_TESTS PROPERTY TYPE BOOL)
-if(ENABLE_TESTS)
-  # activates globally adding tests such that they can be run using ctest
-  enable_testing()
-  # meta-target: each test is supposed to add_dependencies(tests ${NEWTEST})
-  # then, it is possible to build and execute all tests using "ninja tests && ctest"
-  add_custom_target(tests)
-endif()
-
 add_subdirectory(common)
 add_subdirectory(doc)
 add_subdirectory(openair1)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,8 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
      * This decision was made for the license reasons.
      * The Continuous Integration will reject your merge request.
   - All merge requests SHALL have `develop` branch as target branch.
+   - All merge requests SHALL have source branch names that SHALL not contain the `/` character.
+      * We are using a `docker` registry scheme and the image names are based on the source branch name.

 ## Coding Styles ##

--- a/README.md
+++ b/README.md
@@ -12,10 +12,6 @@
    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>

-<p align="center">
-    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/releases"><img alt="GitLab Release (custom instance)" src="https://img.shields.io/gitlab/v/release/oai/openairinterface5g?gitlab_url=https%3A%2F%2Fgitlab.eurecom.fr&include_prereleases&sort=semver"></a>
-</p>
-
 <p align="center">
    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Container-Parent%2F&label=build%20Images"></a>
 </p>
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -31,9 +31,6 @@ def do5Gtest = false
 //
 def gitCommitAuthorEmailAddr

-// list of failing stages
-def failingStages = ""
-
 pipeline {
  agent {
    label nodeExecutor
@@ -106,6 +103,7 @@ pipeline {
            gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
            gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
            echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
+            sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
          }
        }
      }
@@ -120,49 +118,44 @@ pipeline {
      }
    }
    // Build Stages are Mandatory
+    // Later we will add a Ubuntu20 build
    stage ("Image Building Processes") {
      when { expression {doBuild} }
      parallel {
-        stage ("Ubuntu-Image-Builder") {
+        stage ("Ubuntu18-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
+              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuBuildStatus = finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
+                finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuBuildStatus
              }
            }
          }
        }
-        stage ("RHEL-Cluster-Image-Builder") {
+        stage ("RHEL8-Cluster-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
+              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL8-Cluster-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rhelBuildStatus = finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
+                finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rhelBuildStatus
              }
            }
          }
@@ -176,37 +169,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                cppcheckStatus = finalizeSlaveJob('RAN-cppcheck')
+                finalizeSlaveJob('RAN-cppcheck')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += cppcheckStatus
-              }
-            }
-          }
-        }
-        stage ("ARM-Cross-Compile") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                armBuildStatus = finalizeSlaveJob('RAN-ARM-Cross-Compile-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += armBuildStatus
              }
            }
          }
@@ -226,15 +194,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                physimStatus = finalizeSlaveJob('RAN-PhySim-Cluster')
+                finalizeSlaveJob('RAN-PhySim-Cluster')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += physimStatus
              }
            }
          }
@@ -249,15 +214,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim4GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-4G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-4G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim4GStatus
              }
            }
          }
@@ -272,15 +234,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim5GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-5G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim5GStatus
              }
            }
          }
@@ -295,15 +254,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                l2Sim4GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+                finalizeSlaveJob('RAN-L2-Sim-Test-4G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += l2Sim4GStatus
              }
            }
          }
@@ -318,15 +274,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                l2Sim5GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-5G')
+                finalizeSlaveJob('RAN-L2-Sim-Test-5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += l2Sim5GStatus
              }
            }
          }
@@ -335,45 +288,18 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-FDD-LTEBOX-Container')
+              triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'RAN-LTE-FDD-LTEBOX-Container')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteTDDB200Status = finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteTDDB200Status
-              }
-            }
-          }
-        }
-        // Pipeline to test OAI LTE-UE
-        stage ("LTE-B200-FDD-OAIUE-OAICN4G-Container") {
-          when { expression {do4Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-LTE-FDD-OAIUE-OAICN4G-Container', 'LTE-FDD-OAIUE-OAICN4G-Container')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteFDDB200OAIUEStatus = finalizeSlaveJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200OAIUEStatus
              }
            }
          }
@@ -382,21 +308,18 @@ pipeline {
          when { expression {do4Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-TDD-LTEBOX-Container')
+              triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'RAN-LTE-TDD-LTEBOX-Container')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteFDDB200Status = finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200Status
              }
            }
          }
@@ -411,15 +334,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                nsaTDDB200Status = finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
+                finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += nsaTDDB200Status
              }
            }
          }
@@ -434,15 +354,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saTDDB200Status = finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
+                finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saTDDB200Status
              }
            }
          }
@@ -457,15 +374,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                phytestLDPCoffloadStatus = finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
+                finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += phytestLDPCoffloadStatus
              }
            }
          }
@@ -480,15 +394,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteTDD2x2N3xxStatus = finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += lteTDD2x2N3xxStatus
              }
            }
          }
@@ -503,15 +414,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAW2SStatus = finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saAW2SStatus
              }
            }
          }
@@ -526,15 +434,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+                finalizeSlaveJob('RAN-Interop-F1')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += f1InteropStatus
              }
            }
          }
@@ -549,15 +454,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                cn5gCOTSUESanityCheck = finalizeSlaveJob('OAI-CN5G-COTS-UE-Test')
+                finalizeSlaveJob('OAI-CN5G-COTS-UE-Test')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += cn5gCOTSUESanityCheck
              }
            }
          }
@@ -566,21 +468,18 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
+              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'RAN-SA-OAIUE-CN5G')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saOAIUEStatus = finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
+                finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saOAIUEStatus
              }
            }
          }
@@ -599,13 +498,30 @@ pipeline {
          script {
            echo "Push to Docker-Hub KO"
            currentBuild.result = 'FAILURE'
-            failingStages += '\n * RAN-DockerHub-Push'
          }
        }
      }
    }
  }
  post {
+    always {
+      script {
+        def eSubject = JOB_NAME + ' - Build # ' + BUILD_ID + ' - ' + currentBuild.result + '!'
+        def eBody = "Hi,\n\n"
+        eBody += "Here are attached HTML report files for " + JOB_NAME + "  - Build # " + BUILD_ID + " - " + currentBuild.result + "!\n\n"
+        eBody += "Regards,\n"
+        eBody += "OAI CI Team"
+        emailext attachmentsPattern: '*results*.html',
+           body: eBody,
+           replyTo: 'no-reply@openairinterface.org',
+           subject: eSubject,
+           to: gitCommitAuthorEmailAddr
+
+        if (fileExists('.git/CI_COMMIT_MSG')) {
+          sh "rm -f .git/CI_COMMIT_MSG"
+        }
+      }
+    }
    success {
      script {
        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
@@ -623,8 +539,7 @@ pipeline {
      script {
        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
        if ("MERGE".equals(env.gitlabActionType)) {
-          def fullMessage = message + '\n\nList of failing test stages:' + failingStages
-          addGitLabMRComment comment: fullMessage
+          addGitLabMRComment comment: message
          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
          sendSocialMediaMessage('ci-enb', 'danger', message2)
        } else {
@@ -672,7 +587,6 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
  if ("MERGE".equals(env.gitlabActionType)) {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
    shortenShaOne = shortenShaOne.trim()
-    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
  } else {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
@@ -727,29 +641,21 @@ def triggerSlaveJobNoGitLab (jobName) {
 }

 def finalizeSlaveJob(jobName) {
-  lock ('Parent-Lock') {
-    // In case of any non-success, we are retrieving the HTML report of the last completed
-    // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
-    if (jobName == 'OAI-CN5G-COTS-UE-Test') {
-      fileName = "test_results_oai_cn5g_cots_ue.html"
-    } else {
-      fileName = "test_results-${jobName}.html"
+  // In case of any non-success, we are retrieving the HTML report of the last completed
+  // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
+  if (jobName == 'OAI-CN5G-COTS-UE-Test') {
+    fileName = "test_results_oai_cn5g_cots_ue.html"
+  } else {
+    fileName = "test_results-${jobName}.html"
+  }
+  if (!fileExists(fileName)) {
+    copyArtifacts(projectName: jobName,
+      filter: 'test_results*.html',
+      selector: lastCompleted())
+    if (fileExists(fileName)) {
+      sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
+      archiveArtifacts artifacts: fileName
    }
-    artifactUrl = BUILD_URL
-    if (!fileExists(fileName)) {
-      copyArtifacts(projectName: jobName,
-        filter: 'test_results*.html',
-        selector: lastCompleted())
-      if (fileExists(fileName)) {
-        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
-        archiveArtifacts artifacts: fileName
-        // BUILD_URL is like  http://server:port/jenkins/job/foo/15/
-        // no need to add a prefixed '/'
-        artifactUrl += 'artifact/' + fileName
-      }
-    }
-    artifactUrl = "\n * [${jobName}](${artifactUrl})"
-    return artifactUrl
  }
 }

--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -67,13 +67,6 @@ pipeline {
  }

  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
    stage ('Verify Parameters') {
      steps {
        script {
--- a/ci-scripts/Jenkinsfile-nrue
+++ b/ci-scripts/Jenkinsfile-nrue
@@ -61,13 +61,6 @@ pipeline {
  }

  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
    stage ('Verify Parameters') {
      steps {
        script {
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -61,13 +61,6 @@ pipeline {
  }

  stages {
-    stage("Build Init") {
-        steps {
-            // update the build name and description
-            buildName "${params.eNB_MR}"
-            buildDescription "Branch : ${params.eNB_Branch}"
-        }
-    }
    stage ('Verify Parameters') {
      steps {
        script {
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -66,13 +66,6 @@ pipeline {
    }

    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -54,13 +54,6 @@ pipeline {
        lock(extra: lockResources)
    }
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -66,14 +66,32 @@ pipeline {
        ansiColor('xterm')
        lock(extra: lockResources)
    }
+    // the following parameter options are commented out so it shows the ones
+    // that you SHALL have to run the job.
+    // You can use them as template
+    /*
+    parameters {
+        //node-test parameters
+        string(name: 'pythonExecutor', defaultValue: 'nodea', description: 'Node where the pipeline - python scripts will be executed')
+        string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
+        string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
+        booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
+        string(name: 'lockResources', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
+
+        //eNB parameters
+        string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
+        credentials(name: 'eNB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for eNB')
+        string(name: 'eNB_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of eNB source code')
+
+        //EPC parameters
+        string(name: 'EPC_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of EPC')
+        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
+        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
+        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
+    }
+    */
+
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
@@ -1,281 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000100",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000102",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000103",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000104",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000110",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000105",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000106",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000107",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000108",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000109",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -49,75 +49,75 @@ adb_ue_2:

 amarisoft_ue:
  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
  NetworkScript: ip netns exec ue1 ip a show dev pdn0
  CmdPrefix: ip netns exec ue1
  MTU: 1500
 amarisoft_ue_2:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
  NetworkScript: ip netns exec ue2 ip a show dev pdn0
  CmdPrefix: ip netns exec ue2
  MTU: 1500
 amarisoft_ue_3:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
  NetworkScript: ip netns exec ue3 ip a show dev pdn0
  CmdPrefix: ip netns exec ue3
  MTU: 1500
 amarisoft_ue_4:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
  NetworkScript: ip netns exec ue4 ip a show dev pdn0
  CmdPrefix: ip netns exec ue4
  MTU: 1500
 amarisoft_ue_5:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
  NetworkScript: ip netns exec ue5 ip a show dev pdn0
  CmdPrefix: ip netns exec ue5
  MTU: 1500
 amarisoft_ue_6:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
  NetworkScript: ip netns exec ue6 ip a show dev pdn0
  CmdPrefix: ip netns exec ue6
  MTU: 1500
 amarisoft_ue_7:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
  NetworkScript: ip netns exec ue7 ip a show dev pdn0
  CmdPrefix: ip netns exec ue7
  MTU: 1500
 amarisoft_ue_8:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
  NetworkScript: ip netns exec ue8 ip a show dev pdn0
  CmdPrefix: ip netns exec ue8
  MTU: 1500
 amarisoft_ue_9:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
  NetworkScript: ip netns exec ue9 ip a show dev pdn0
  CmdPrefix: ip netns exec ue9
  MTU: 1500
 amarisoft_ue_10:
  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
  NetworkScript: ip netns exec ue10 ip a show dev pdn0
  CmdPrefix: ip netns exec ue10
  MTU: 1500
@@ -130,13 +130,6 @@ oai_ue_caracal:
  IF: oaitun_ue1
  MTU: 1500

-lte_oai_ue_carabe:
-  Host: carabe
-  NetworkScript: docker exec lte-b200-ue-fdd-10Mhz-tm1 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec lte-b200-ue-fdd-10Mhz-tm1
-  IF: oaitun_ue1
-  MTU: 1500
-
 rfsim5g_gnb_nos1:
  Host: localhost
  NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
@@ -161,78 +154,6 @@ rfsim5g_ue2:
  DetachScript: docker stop rfsim5g-oai-nr-ue2
  MTU: 1500

-rfsim5g_ue3:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue3
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue3
-  DetachScript: docker stop rfsim5g-oai-nr-ue3
-  MTU: 1500
-
-rfsim5g_ue4:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue4
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue4
-  DetachScript: docker stop rfsim5g-oai-nr-ue4
-  MTU: 1500
-
-rfsim5g_ue5:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue5
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue5
-  DetachScript: docker stop rfsim5g-oai-nr-ue5
-  MTU: 1500
-
-rfsim5g_ue6:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue6
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue6
-  DetachScript: docker stop rfsim5g-oai-nr-ue6
-  MTU: 1500
-
-rfsim5g_ue7:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue7
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue7
-  DetachScript: docker stop rfsim5g-oai-nr-ue7
-  MTU: 1500
-
-rfsim5g_ue8:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue8
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue8
-  DetachScript: docker stop rfsim5g-oai-nr-ue8
-  MTU: 1500
-
-rfsim5g_ue9:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue9
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue9
-  DetachScript: docker stop rfsim5g-oai-nr-ue9
-  MTU: 1500
-
-rfsim5g_ue10:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue10
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue10
-  DetachScript: docker stop rfsim5g-oai-nr-ue10
-  MTU: 1500
-
 rfsim5g_ext_dn:
  Host: localhost
  NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
@@ -257,12 +178,9 @@ rfsim4g_enb_nos1:

 l2sim5g_ue:
  Host: localhost
-  AttachScript: docker start l2sim-oai-nr-ue0
-  DetachScript: docker stop l2sim-oai-nr-ue0
  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
  CmdPrefix: docker exec l2sim-oai-nr-ue0
  IF: oaitun_ue1
-  MTU: 1500

 l2sim5g_ext_dn:
  Host: localhost
@@ -271,12 +189,9 @@ l2sim5g_ext_dn:

 l2sim4g_ue:
  Host: localhost
-  AttachScript: docker start l2sim4g-oai-lte-ue1
-  DetachScript: docker stop l2sim4g-oai-lte-ue1
  NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
  CmdPrefix: docker exec l2sim4g-oai-lte-ue1
  IF: oaitun_ue1
-  MTU: 1500

 l2sim4g_ext_dn:
  Host: localhost
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -132,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -266,8 +266,7 @@ class Cluster:
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
-			branchName = self.ranBranch.replace('/','-')
-			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == 'develop':
 				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
@@ -413,6 +412,7 @@ class Cluster:
 		imageSize = {}
 		for image in attemptedImages:
 			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
+			self.cmd.run(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log')
 			tag = imageTag if image != 'ran-base' else baseTag
 			size = self._get_image_size(image, tag)
 			if size <= 0:
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']

 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -97,9 +97,7 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 def ImageTagToUse(imageName, ranCommitID, ranBranch, ranAllowMerge):
 	shortCommit = ranCommitID[0:8]
 	if ranAllowMerge:
-		# Allowing contributor to have a name/branchName format
-		branchName = ranBranch.replace('/','-')
-		tagToUse = f'{branchName}-{shortCommit}'
+		tagToUse = f'{ranBranch}-{shortCommit}'
 	else:
 		tagToUse = f'develop-{shortCommit}'
 	fullTag = f'{imageName}:{tagToUse}'
@@ -155,13 +153,17 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 			committed = False
 			tagged = False
 			with open(f'{buildRoot}/{image}.log', mode='r') as inputfile:
+				startOfTargetImageCreation = False # check for tagged/committed only after image created
 				for line in inputfile:
-					lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
-					lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
-					tagged = tagged or lineHasTag or lineHasTag2
-					# the OpenShift Cluster builder prepends image registry URL
-					lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
-					committed = committed or lineHasCommit
+					result = re.search(f'FROM .* [aA][sS] {image}$', str(line))
+					if result is not None:
+						startOfTargetImageCreation = True
+					if startOfTargetImageCreation:
+						lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
+						tagged = tagged or lineHasTag
+						# the OpenShift Cluster builder prepends image registry URL
+						lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
+						committed = committed or lineHasCommit
 			errorandwarnings['errors'] = 0 if committed or tagged else 1
 			errorandwarnings['warnings'] = 0
 			errorandwarnings['status'] = committed or tagged
@@ -289,7 +291,6 @@ class Containerize():
 		self.proxyCommit = None
 		self.eNB_instance = 0
 		self.eNB_serverId = ['', '', '']
-		self.deployKind = [True, True, True]
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.nb_healthy = [0, 0, 0]
@@ -357,40 +358,34 @@ class Containerize():
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
 			self.dockerfileprefix = '.ubuntu20'
-			self.cliBuildOptions = ''
+			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--disable-compression'
+			self.cliBuildOptions = '--no-cache --disable-compression'

 		# we always build the ran-build image with all targets
-		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
-		imageNames = [('ran-build', 'build', 'ran-build', '')]
+		imageNames = [('ran-build', 'build')]
 		result = re.search('eNB', self.imageKind)
+		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
 		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-		result = re.search('gNB', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('all', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
-			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			if self.host == 'Red Hat':
-				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
-			if self.host == 'Ubuntu':
-				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				# Building again the 5G images with Address Sanitizer
-				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-		result = re.search('build_cross_arm64', self.imageKind)
-		if result is not None:
-			self.dockerfileprefix = '.ubuntu20.cross-arm64'
+			imageNames.append(('oai-enb', 'eNB'))
+		else:
+			result = re.search('gNB', self.imageKind)
+			if result is not None:
+				imageNames.append(('oai-gnb', 'gNB'))
+			else:
+				result = re.search('all', self.imageKind)
+				if result is not None:
+					imageNames.append(('oai-enb', 'eNB'))
+					imageNames.append(('oai-gnb', 'gNB'))
+					imageNames.append(('oai-nr-cuup', 'nr-cuup'))
+					imageNames.append(('oai-lte-ue', 'lteUE'))
+					imageNames.append(('oai-nr-ue', 'nrUE'))
+					if self.host == 'Red Hat':
+						imageNames.append(('oai-physim', 'phySim'))
+					if self.host == 'Ubuntu':
+						imageNames.append(('oai-lte-ru', 'lteRU'))
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -424,13 +419,14 @@ class Containerize():

 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
-		for image,pattern,name,option in imageNames:
-			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
+		if forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+		for image,pattern in imageNames:
+			cmd.run(f"{self.cli} image rm {image}:{imageTag}")

 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
@@ -438,13 +434,13 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
+			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
 			cmd.run(f"{self.cli} image prune --force")
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -464,52 +460,44 @@ class Containerize():
 		# Build the target image(s)
 		status = True
 		attemptedImages = ['ran-base']
-		for image,pattern,name,option in imageNames:
-			attemptedImages += [name]
+		for image,pattern in imageNames:
+			attemptedImages += [image]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			# 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 image != 'ran-build':
+			if image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
-			if image == 'ran-build' and ret.returncode == 0:
-				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
-				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
-				cmd.run(f"docker rm -f test-log")
-			else:
-				cmd.run(f"mkdir -p cmake_targets/log/{name}")
+			cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', timeout=1200)
+			# split the log
+			cmd.run(f"mkdir -p cmake_targets/log/{image}")
+			cmd.run(f"python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log")
 			# check the status of the build
-			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
+			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {image}:{imageTag}")
 			if ret.returncode != 0:
-				logging.error('\u001B[1m Could not build properly ' + name + '\u001B[0m')
+				logging.error('\u001B[1m Could not build properly ' + image + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
-				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
-				allImagesSize[name] = 'N/A -- Build Failed'
+				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
+				allImagesSize[image] = 'N/A -- Build Failed'
 				break
 			else:
 				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 				if result is not None:
 					size = float(result.group("size")) / 1000000 # convert to MB
 					imageSizeStr = f'{size:.1f}'
-					logging.debug(f'\u001B[1m   {name} size is {imageSizeStr} Mbytes\u001B[0m')
-					allImagesSize[name] = f'{imageSizeStr} Mbytes'
+					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
+					allImagesSize[image] = f'{imageSizeStr} Mbytes'
 				else:
-					logging.debug(f'{name} size is unknown')
-					allImagesSize[name] = 'unknown'
+					logging.debug(f'{image} size is unknown')
+					allImagesSize[image] = 'unknown'
 			# Now pruning dangling images in between target builds
 			cmd.run(f"{self.cli} image prune --force")

 		# Remove all intermediate build images and clean up
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
+		if self.ranAllowMerge and forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
-		# Remove any cached artifacts: we don't use the cache for now, prevent
-		# out of diskspace problem
-		cmd.run(f"{self.cli} buildx prune --filter=until=6h --force")

 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
@@ -523,13 +511,12 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)

 	def BuildProxy(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -570,7 +557,7 @@ class Containerize():
 			sys.exit(1)

 		self.cli = 'docker'
-		self.cliBuildOptions = ''
+		self.cliBuildOptions = '--no-cache'

 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -612,7 +599,7 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
-				return False
+				sys.exit(1)
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')

@@ -674,87 +661,6 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

-	def BuildRunTests(self, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.RemoteCmd(lIpAddr)
-		cmd.cd(lSourcePath)
-
-		ret = cmd.run('hostnamectl')
-		result = re.search('Ubuntu', ret.stdout)
-		host = result.group(0)
-		if host != 'Ubuntu':
-			cmd.close()
-			raise Exception("Can build unit tests only on Ubuntu server")
-		logging.debug('running on Ubuntu as expected')
-
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-		self.testCase_id = HTML.testCase_id
-	
-		# check that ran-base image exists as we expect it
-		baseImage = 'ran-base'
-		baseTag = 'develop'
-		if self.ranAllowMerge:
-			if self.ranTargetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
-				result = re.search('index', cmd.getBefore())
-				if result is not None:
-					baseTag = 'develop'
-		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
-		if ret.returncode != 0:
-			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
-		if ret.returncode != 0:
-			logging.error(f'Cannot build unit tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
-
-		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:develop')
-		build_log_name = f'build_log_{self.testCase_id}'
-		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
-		cmd.close()
-
-		if ret.returncode == 0:
-			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
-			HTML.CreateHtmlTabFooter(True)
-			return True
-		else:
-			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
 			lIpAddr = self.eNBIPAddress
@@ -789,11 +695,10 @@ class Containerize():
 		orgTag = 'develop'
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
-			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
-				continue
 			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
@@ -837,7 +742,6 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
 		myCmd = cls_cmd.getConnection(lIpAddr)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
@@ -928,7 +832,6 @@ class Containerize():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		self.deployKind[self.eNB_instance] = True

 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -1000,7 +903,7 @@ class Containerize():
 			cnt = 0
 			while (cnt < 20):
 				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
+				result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -1082,11 +985,14 @@ class Containerize():
 		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
 			filename = f'{svcName}-{HTML.testCase_id}.log'
+			#mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} | head -n -1 &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 30)
 			mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 120)

-		mySSH.command('docker-compose -f ci-docker-compose.yml down -v', '\$', 5)
-		mySSH.close()
+		mySSH.command('docker-compose -f ci-docker-compose.yml down', '\$', 5)
+		# Cleaning any created tmp volume
+		mySSH.command('docker volume prune --force', '\$', 20)

+		mySSH.close()
 		# Analyzing log file!
 		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
 		if len(services) > 1:
@@ -1099,7 +1005,7 @@ class Containerize():
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
-		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
+		elif 'oai-nr-ue' in services:
 			self.exitStatus == 0
 			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
@@ -1131,7 +1037,6 @@ class Containerize():
 		logging.debug('\u001B[1m Checking Services to deploy\u001B[0m')
 		# Implicitly we are running locally
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
-		self.deployKind[0] = False
 		cmd = 'docker-compose config --services'
 		listServices = myCmd.run(cmd)
 		if listServices.returncode != 0:
@@ -1153,16 +1058,6 @@ class Containerize():
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			# In the scenario, for 5G images, we have the choice of either pulling normal images
-			# or -asan images. We need to detect which kind we did pull.
-			if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
-				ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False, silent=self.displayedNewTags)
-				if ret.returncode != 0:
-					tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan')
-					tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan')
-					tagToUse = tagToUse.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
-					if not self.displayedNewTags:
-						logging.debug(f'\u001B[1m Using sanitized version of {image} with {tagToUse}\u001B[0m')
 			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True
@@ -1301,7 +1196,12 @@ class Containerize():
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd)
+		myCmd.run(cmd, silent=self.displayedNewTags)
+		for image in IMAGES:
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
+			myCmd.run(cmd, silent=self.displayedNewTags)
+		self.displayedNewTags = True

 		# check which containers are running for log recovery later
 		cmd = 'docker-compose -f docker-compose-ci.yml ps --all'
@@ -1342,7 +1242,7 @@ class Containerize():
 		fullStatus = True
 		if anyLogs:
 			# Analyzing log file(s)!
-			listOfPossibleRanContainers = ['enb*', 'gnb*', 'cu*', 'du*']
+			listOfPossibleRanContainers = ['enb', 'gnb', 'cu', 'du']
 			for container in listOfPossibleRanContainers:
 				filenames = './*-oai-' + container + '.log'
 				cmd = f'ls {filenames}'
@@ -1395,7 +1295,7 @@ class Containerize():

 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		logging.debug(f'Working dir is back {self.yamlPath[0]}')
-		cmd = 'docker-compose -f docker-compose-ci.yml down -v'
+		cmd = 'docker-compose -f docker-compose-ci.yml down'
 		deployStatus = myCmd.run(cmd, timeout=100)
 		if deployStatus.returncode != 0:
 			myCmd.close()
@@ -1406,6 +1306,9 @@ class Containerize():
 			return

 		self.deployedContainers = []
+		# Cleaning any created tmp volume
+		cmd = 'docker volume prune --force'
+		deployStatus = myCmd.run(cmd, timeout=100, reportNonZero=False)
 		myCmd.close()

 		if fullStatus:
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -469,8 +469,8 @@ class HTMLManagement():
 				self.htmlFile.write('        <td bgcolor = "orange" >')
 			else:
 				self.htmlFile.write('        <td>')
-			for i in infoList: # add custom style to have elements side-by-side to reduce need for vertical space
-				self.htmlFile.write(f'         <pre style="display: inline flow-root list-item; margin: 0 3px 0 3px; min-width: 24em;">{i}</pre>')
+			for i in infoList:
+				self.htmlFile.write(f'         <pre>{i}</pre>')

 			self.htmlFile.write('                </td>')
 			self.htmlFile.write('      </tr>\n')
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -43,7 +43,7 @@ import logging
 import datetime
 import signal
 import statistics as stat
-from multiprocessing import SimpleQueue, Lock
+from multiprocessing import Process, Lock, SimpleQueue
 import concurrent.futures

 #import our libs
@@ -494,7 +494,16 @@ class OaiCiTest():
 			messages = [f.result() for f in futures]
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)

-	def Ping_common(self, EPC, ue, RAN, printLock):
+	def ping_iperf_wrong_exit(self, lock, UE_IPAddress, device_id, statusQueue, message):
+		logging.error(f"ue {device_id} {UE_IPAddress}: {message}")
+		lock.acquire()
+		statusQueue.put(-1)
+		statusQueue.put(device_id)
+		statusQueue.put(UE_IPAddress)
+		statusQueue.put(message)
+		lock.release()
+
+	def Ping_common(self, EPC, ue, RAN):
 		# Launch ping on the EPC side (true for ltebox and old open-air-cn)
 		ping_status = 0
 		ueIP = ue.getIP()
@@ -519,7 +528,6 @@ class OaiCiTest():
 		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
-		ue_header = f'UE {ue.getName()} ({ueIP})'
 		if response.returncode != 0:
 			message = ue_header + ': ping crashed: TIMEOUT?'
 			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
@@ -529,6 +537,7 @@ class OaiCiTest():
 		cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file)
 		cmd.close()

+		ue_header = f'UE {ue.getName()} ({ueIP})'
 		with open(local_ping_log_file, 'r') as f:
 			ping_output = "".join(f.readlines())
 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
@@ -551,8 +560,6 @@ class OaiCiTest():
 		avg_msg = f'RTT(Avg)   : {rtt_avg} ms'
 		max_msg = f'RTT(Max)   : {rtt_max} ms'

-		# adding a lock for cleaner display in command line
-		printLock.acquire()
 		logging.info(f'\u001B[1;37;44m ping result for {ue_header} \u001B[0m')
 		logging.info(f'\u001B[1;34m    {pal_msg} \u001B[0m')
 		logging.info(f'\u001B[1;34m    {min_msg} \u001B[0m')
@@ -565,7 +572,6 @@ class OaiCiTest():
 		if float(packetloss) > float(self.ping_packetloss_threshold):
 			message += '\nPacket Loss too high'
 			logging.error(f'\u001B[1;37;41m Packet Loss too high; Target: {self.ping_packetloss_threshold}%\u001B[0m')
-			printLock.release()
 			return (False, message)
 		elif float(packetloss) > 0:
 			message += '\nPacket Loss is not 0%'
@@ -576,9 +582,7 @@ class OaiCiTest():
 				ping_rttavg_error_msg = f'RTT(Avg) too high: {rtt_avg} ms; Target: {self.ping_rttavg_threshold} ms'
 				message += f'\n {ping_rttavg_error_msg}'
 				logging.error('\u001B[1;37;41m'+ ping_rttavg_error_msg +' \u001B[0m')
-				printLock.release()
 				return (False, message)
-		printLock.release()

 		return (True, message)

@@ -592,9 +596,8 @@ class OaiCiTest():

 		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(ues)
-		pingLock = Lock()
 		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Ping_common, EPC, ue, RAN, pingLock) for ue in ues]
+			futures = [executor.submit(self.Ping_common, EPC, ue, RAN) for ue in ues]
 			results = [f.result() for f in futures]
 			# each result in results is a tuple, first member goes to successes, second to messages
 			successes, messages = map(list, zip(*results))
@@ -614,7 +617,7 @@ class OaiCiTest():
 	def Iperf_ComputeModifiedBW(self, idx, ue_num):
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(self.iperf_args))
 		if result is None:
-			logging.error('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
+			logging.debug('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
 			sys.exit(1)
 		iperf_bandwidth = result.group('iperf_bandwidth')
 		if self.iperf_profile == 'balanced':
@@ -632,11 +635,11 @@ class OaiCiTest():
 		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
 		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
 		if result is None:
-			logging.error('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
+			logging.debug('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
 			sys.exit(1)
 		return result

-	def Iperf_analyzeV2TCPOutput(self, SSH, filename):
+	def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH, filename):

 		SSH.command(f'awk -f /tmp/tcp_iperf_stats.awk {filename}', '\$', 5)
 		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
@@ -644,34 +647,44 @@ class OaiCiTest():
 			avgbitrate = result.group('average')
 			maxbitrate = result.group('maximum')
 			minbitrate = result.group('minimum')
+			lock.acquire()
+			logging.debug(f'\u001B[1;37;44m TCP iperf result ({UE_IPAddress}) \u001B[0m')
 			msg = 'TCP Stats   :\n'
 			if avgbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Avg Bitrate : {avgbitrate} \u001B[0m')
 				msg += f'Avg Bitrate : {avgbitrate} \n'
 			if maxbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Max Bitrate : {maxbitrate} \u001B[0m')
 				msg += f'Max Bitrate : {maxbitrate} \n'
 			if minbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Min Bitrate : {minbitrate} \u001B[0m')
 				msg += f'Min Bitrate : {minbitrate} \n'
-			return (True, msg)
+			statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(msg)
+			lock.release()

-		return (False, "could not analyze log file")
+		return 0

-	def Iperf_analyzeV2Output(self, iperf_real_options, EPC, SSH):
+	def Iperf_analyzeV2Output(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH):

 		result = re.search('-u', str(iperf_real_options))
 		if result is None:
+			logging.debug('Into Iperf_analyzeV2TCPOutput client')
 			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
-			response = self.Iperf_analyzeV2TCPOutput(SSH, filename)
+			response = self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, EPC, SSH, filename)
+			logging.debug(f'Iperf_analyzeV2TCPOutput response returned value = {response}')
 			return response

 		result = re.search('Server Report:', SSH.getBefore())
 		if result is None:
 			result = re.search('read failed: Connection refused', SSH.getBefore())
 			if result is not None:
-				msg = 'Could not connect to iperf server!'
-				return (False, msg)
+				logging.debug('\u001B[1;37;41m Could not connect to iperf server! \u001B[0m')
 			else:
-				msg = 'Server Report and Connection refused Not Found!'
-				return (False, msg)
+				logging.debug('\u001B[1;37;41m Server Report and Connection refused Not Found! \u001B[0m')
+			return -1
 		# Computing the requested bandwidth in float
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
 		if result is not None:
@@ -695,11 +708,14 @@ class OaiCiTest():
 			bitrate = result.group('bitrate')
 			packetloss = result.group('packetloss')
 			jitter = result.group('jitter')
-
+			lock.acquire()
+			logging.debug(f'\u001B[1;37;44m iperf result {UE_IPAddress} \u001B[0m')
 			iperfStatus = True
 			msg = f'Req Bitrate : {req_bandwidth} \n'
+			logging.debug(f'\u001B[1;34m    Req Bitrate : {req_bandwidth} \u001B[0m')
 			if bitrate is not None:
 				msg += f'Bitrate     : {bitrate} \n'
+				logging.debug(f'\u001B[1;34m    Bitrate : {bitrate}  \u001B[0m')
 				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
 				if result is not None:
 					actual_bw = float(str(result.group('real_bw')))
@@ -715,37 +731,50 @@ class OaiCiTest():
 					br_loss = 100 * actual_bw / req_bw
 					bitperf = '%.2f ' % br_loss
 					msg += f'Bitrate Perf: {bitperf} %\n'
+					logging.debug(f'\u001B[1;34m    Bitrate Perf: {bitperf} %\u001B[0m')
 			if packetloss is not None:
 				msg += f'Packet Loss : {packetloss} %\n'
+				logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
 				if float(packetloss) > float(self.iperf_packetloss_threshold):
 					msg += 'Packet Loss too high!\n'
+					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 					iperfStatus = False
 			if jitter is not None:
 				msg += f'Jitter      : {jitter} \n'
-
-			return (iperfStatus, msg)
+				logging.debug(f'\u001B[1;34m    Jitter      : {jitter} \u001B[0m')
+			if (iperfStatus):
+				statusQueue.put(0)
+			else:
+				statusQueue.put(-1)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(msg)
+			lock.release()
+			return 0
 		else:
-			return (False, "could not analyze server log")
+			return -2


-	def Iperf_analyzeV2BIDIR(self, server_filename, client_filename):
+	def Iperf_analyzeV2BIDIR(self, lock, UE_IPAddress, device_id, statusQueue,server_filename,client_filename):

 		#check the 2 files are here 
 		if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
-			return (False, 'Bidir TCP: Client or Server Log File not present')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client or Server Log File not present')
+			return
 		#check the 2 files size
 		if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
-			return (False, 'Bidir TCP: Client and Server Log File are empty')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client and Server Log File are empty')
+			return

-		report_msg = ''
+		report_msg='TCP BIDIR Report:\n'
 		#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
 		client_filesize = os.path.getsize(client_filename)
 		if client_filesize == 0:
 			report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
-			report_msg+="Partial report from server file"
+			report_msg+="Partial report from server file\n"
 			filename = server_filename
 		else :		
-			report_msg+="Report from client file (UE)"
+			report_msg+="Report from client file (UE)\n"
 			filename = client_filename

 		report=[] #used to check if relevant lines were found
@@ -755,19 +784,32 @@ class OaiCiTest():
 				result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
 				if result is not None:
 					report.append(str(line))
-					report_msg += f"\n{result.group('role')} {result.group('direction')}\t: {result.group('bitrate')}"
-		if len(report) == 0:
-			return (False, 'Bidir TCP: Could not analyze from Log file')
+					report_msg+=result.group('role') + ' ' + result.group('direction')+ '\t = ' +result.group('bitrate')+'\n'
+		if len(report)>0:
+			lock.acquire()
+			statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(report_msg)
+			logging.debug(f'\u001B[1;37;45m TCP Bidir Iperf Result ({UE_IPAddress}) \u001B[0m')
+			for rLine in report_msg.split('\n'):
+				logging.debug(f'\u001B[1;35m    {rLine} \u001B[0m')
+			lock.release()
+		else:
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')

-		return (True, report_msg)

-	def Iperf_analyzeV2Server(self, iperf_real_options, filename, type):
+
+	def Iperf_analyzeV2Server(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, filename,type):
 		if (not os.path.isfile(filename)):
-			return (False, 'Could not analyze from server log')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
+			return
 		# Computing the requested bandwidth in float
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
 		if result is None:
-			return (False, 'Could not compute Iperf bandwidth!')
+			logging.debug('Iperf bandwidth Not Found!')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not compute Iperf bandwidth!')
+			return
 		else:
 			req_bandwidth = result.group('iperf_bandwidth')
 			req_bw = float(req_bandwidth)
@@ -814,8 +856,6 @@ class OaiCiTest():
 				br_sum = curr_br + br_sum
 				ji_sum = float(ji[0]) + ji_sum

-		server_file.close()
-
 		if (row_idx > 0):
 			br_sum = br_sum / row_idx
 			ji_sum = ji_sum / row_idx
@@ -836,25 +876,87 @@ class OaiCiTest():
 				pl = float(100 * pl_sum / ps_sum)
 				packetloss = '%2.1f ' % (pl)
 				packetloss += '%'
-
-			result = float(br_loss) >= float(self.iperf_bitrate_threshold) and float(pl) <= float(self.iperf_packetloss_threshold)
+				#checking packet loss compliance
+				if float(pl) > float(self.iperf_packetloss_threshold):
+					pal_too_high_msg = 'Packet Loss too high :  tested = '+packetloss+', target = '+self.iperf_packetloss_threshold+'%'
+				else:
+					pal_too_high_msg='Packet Loss value is within acceptance range'
+				#checking bitrate perf compliance
+				if float(br_loss) < float(self.iperf_bitrate_threshold):
+					bit_too_low_msg = 'Bitrate too low :  tested = '+bitperf+', target = '+self.iperf_bitrate_threshold+'%'
+				else:
+					bit_too_low_msg='Bitrate perf value is within acceptance range'
+			lock.acquire()
+			if (float(br_loss) < float(self.iperf_bitrate_threshold)) and (float(pl) > float(self.iperf_packetloss_threshold)):
+				statusQueue.put(-1)
+			elif (float(br_loss) < float(self.iperf_bitrate_threshold)) or (float(pl) > float(self.iperf_packetloss_threshold)): 
+				statusQueue.put(1)
+			else:
+				statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
 			req_msg = f'Req Bitrate : {req_bandwidth}'
 			bir_msg = f'Bitrate     : {bitrate}'
 			brl_msg = f'Bitrate Perf: {bitperf}'
-			if float(br_loss) < float(self.iperf_bitrate_threshold):
-				brl_msg += f' (too low! <{self.iperf_bitrate_threshold}%)'
 			jit_msg = f'Jitter      : {jitter}'
 			pal_msg = f'Packet Loss : {packetloss}'
-			if float(pl) > float(self.iperf_packetloss_threshold):
-				pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
-			return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
+			statusQueue.put(f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}\n{pal_too_high_msg}\n{bit_too_low_msg}\n')
+			logging.debug(f'\u001B[1;37;45m iperf result ({UE_IPAddress}) \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {req_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bir_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {brl_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {jit_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_too_high_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bit_too_low_msg} \u001B[0m')
+			lock.release()
 		else:
-			return (False, 'Could not analyze from server log')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')

-	def Iperf_Module(self, EPC, ue, RAN, idx, ue_num):
-		ueIP = ue.getIP()
-		if not ueIP:
-			return (False, f"UE {ue.getName()} has no IP address")
+		server_file.close()
+
+
+	def Iperf_analyzeV3Output(self, lock, UE_IPAddress, device_id, statusQueue,SSH):
+
+		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\r\n(?:|\[ *\d+\] Sent \d+ datagrams)\r\niperf Done\.', SSH.getBefore())
+		if result is None:
+			result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', SSH.getBefore())
+			lock.acquire()
+			statusQueue.put(-1)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			if result is not None:
+				logging.debug(f"\u001B[1;37;41m {result.group('error')} \u001B[0m")
+				statusQueue.put(result.group('error'))
+			else:
+				logging.debug('\u001B[1;37;41m Bitrate and/or Packet Loss Not Found! \u001B[0m')
+				statusQueue.put('Bitrate and/or Packet Loss Not Found!')
+			lock.release()
+
+		bitrate = result.group('bitrate')
+		packetloss = result.group('packetloss')
+		lock.acquire()
+		logging.debug(f'\u001B[1;37;44m iperf result ({UE_IPAddress}) \u001B[0m')
+		logging.debug(f'\u001B[1;34m    Bitrate     : {bitrate} \u001B[0m')
+		msg = f'Bitrate     : {bitrate} \n'
+		iperfStatus = True
+		if packetloss is not None:
+			logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
+			msg += f'Packet Loss : {packetloss} %\n'
+			if float(packetloss) > float(self.iperf_packetloss_threshold):
+				logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
+				msg += 'Packet Loss too high!\n'
+				iperfStatus = False
+		if (iperfStatus):
+			statusQueue.put(0)
+		else:
+			statusQueue.put(-1)
+		statusQueue.put(device_id)
+		statusQueue.put(UE_IPAddress)
+		statusQueue.put(msg)
+		lock.release()
+
+	def Iperf_Module(self, lock, statusQueue, EPC, ue, RAN, idx, ue_num):
 		SSH = sshconnection.SSHConnection()
 		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
 		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
@@ -885,18 +987,16 @@ class OaiCiTest():
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf' if re.search('adb', ue.getName()) else 'iperf'

-		ue_header = f'UE {ue.getName()} ({ueIP})'
-
 		if self.iperf_direction == "DL":
 			logging.debug("Iperf in DL requested")
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm {server_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ueIP} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ue.getIP()} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
 			cmd.close()

 			cmd = cls_cmd.getConnection(EPC.IPAddress)
 			cmd.run(f'rm {EPC.SourceCodePath}/{client_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf -c {ueIP} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
+			cmd.run(f'{cn_iperf_prefix} iperf -c {ue.getIP()} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
 			cmd.copyin(f'{EPC.SourceCodePath}/{client_filename}', client_filename)
 			cmd.close()

@@ -905,10 +1005,10 @@ class OaiCiTest():
 			cmd.close()

 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"{EPC.SourceCodePath}/{client_filename}")
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"{EPC.SourceCodePath}/{client_filename}")
 				cmd.close()

 		elif self.iperf_direction == "UL":
@@ -920,7 +1020,7 @@ class OaiCiTest():

 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{client_filename}', client_filename)
 			cmd.close()

@@ -929,10 +1029,10 @@ class OaiCiTest():
 			cmd.close()

 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(ue.getHost())
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"/tmp/{client_filename}")
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"/tmp/{client_filename}")
 				cmd.close()

 		elif self.iperf_direction=="BIDIR":
@@ -944,7 +1044,7 @@ class OaiCiTest():

 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'iperf3 -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'iperf3 -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{client_filename}', client_filename)
 			cmd.close()

@@ -952,32 +1052,129 @@ class OaiCiTest():
 			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
 			cmd.close()

-			status, msg = self.Iperf_analyzeV2BIDIR(server_filename, client_filename)
+			self.Iperf_analyzeV2BIDIR(lock, ue.getHost(), ue.getName(), statusQueue, server_filename, client_filename)

 		elif self.iperf_direction == "IPERF3":
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{server_filename}', reportNonZero=False)
 			port = f'{5002+idx}'
-			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ueIP} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ue.getIP()} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{server_filename}', server_filename)
 			cmd.close()
 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f'/tmp/{server_filename}')
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f'/tmp/{server_filename}')
 				cmd.close()

 		else :
 			raise Exception("Incorrect or missing IPERF direction in XML")

-		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
-		for l in msg.split('\n'):
-			logging.info(f'\u001B[1;35m    {l} \u001B[0m')
-		return (status, f'{ue_header}\n{msg}')
-
 	def IperfNoS1(self,HTML,RAN,EPC,CONTAINERS):
-		raise 'IperfNoS1 not implemented'
+		SSH = sshconnection.SSHConnection()
+		if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		check_eNB = True
+		check_OAI_UE = True
+		server_on_enb = re.search('-R', str(self.iperf_args))
+		if server_on_enb is not None:
+			iServerIPAddr = RAN.eNBIPAddress
+			iServerUser = RAN.eNBUserName
+			iServerPasswd = RAN.eNBPassword
+			iClientIPAddr = self.UEIPAddress
+			iClientUser = self.UEUserName
+			iClientPasswd = self.UEPassword
+		else:
+			iServerIPAddr = self.UEIPAddress
+			iServerUser = self.UEUserName
+			iServerPasswd = self.UEPassword
+			iClientIPAddr = RAN.eNBIPAddress
+			iClientUser = RAN.eNBUserName
+			iClientPasswd = RAN.eNBPassword
+		if self.iperf_options != 'sink':
+			# Starting the iperf server
+			SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
+			# args SHALL be "-c client -u any"
+			# -c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1
+			# -B 10.0.1.1 -u -s -i 1 -fm
+			server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
+			server_options = server_options.replace('-c','-B')
+			SSH.command(f'rm -f /tmp/tmp_iperf_server_{self.testCase_id}.log', '\$', 5)
+			SSH.command(f'echo $USER; nohup iperf {server_options} > /tmp/tmp_iperf_server_{self.testCase_id}.log 2>&1 &', iServerUser, 5)
+			time.sleep(0.5)
+			SSH.close()
+
+		# Starting the iperf client
+		modified_options = self.Iperf_ComputeModifiedBW(0, 1)
+		modified_options = modified_options.replace('-R','')
+		iperf_time = self.Iperf_ComputeTime()
+		SSH.open(iClientIPAddr, iClientUser, iClientPasswd)
+		SSH.command(f'rm -f /tmp/tmp_iperf_{self.testCase_id}.log', '\$', 5)
+		iperf_status = SSH.command(f'stdbuf -o0 iperf {modified_options} 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_{self.testCase_id}.log', '\$', int(iperf_time)*5.0)
+		status_queue = SimpleQueue()
+		lock = Lock()
+		if iperf_status < 0:
+			message = 'iperf on OAI UE crashed due to TIMEOUT !'
+			logging.debug(f'\u001B[1;37;41m {message} \u001B[0m')
+			clientStatus = -2
+		else:
+			if self.iperf_options == 'sink':
+				clientStatus = 0
+				status_queue.put(0)
+				status_queue.put('OAI-UE')
+				status_queue.put('10.0.1.2')
+				status_queue.put('Sink Test : no check')
+			else:
+				clientStatus = self.Iperf_analyzeV2Output(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options, EPC,SSH)
+		SSH.close()
+
+		# Stopping the iperf server
+		if self.iperf_options != 'sink':
+			SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
+			SSH.command('killall --signal SIGKILL iperf', '\$', 5)
+			time.sleep(0.5)
+			SSH.close()
+
+		if (clientStatus == -1):
+			if (os.path.isfile(f'iperf_server_{self.testCase_id}.log')):
+				os.remove(f'iperf_server_{self.testCase_id}.log')
+			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			filename=f'iperf_server_{self.testCase_id}_OAI-UE.log'
+			self.Iperf_analyzeV2Server(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options,filename,0)
+
+		# copying on the EPC server for logCollection
+		if (clientStatus == -1):
+			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			if (copyin_res == 0):
+				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_server_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, f'/tmp/tmp_iperf_{self.testCase_id}.log', f'iperf_{self.testCase_id}_OAI-UE.log')
+		if (copyin_res == 0):
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+		iperf_noperf = False
+		if status_queue.empty():
+			iperf_status = False
+		else:
+			iperf_status = True
+		messages = []
+		while (not status_queue.empty()):
+			count = status_queue.get()
+			if (count < 0):
+				iperf_status = False
+			if (count > 0):
+				iperf_noperf = True
+			device_id = status_queue.get()
+			ip_addr = status_queue.get()
+			message = status_queue.get()
+			messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{message}')
+		if (iperf_noperf and iperf_status):
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
+		elif (iperf_status):
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
+		else:
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)

 	def Iperf(self,HTML,RAN,EPC,CONTAINERS):
 		result = re.search('noS1', str(RAN.Initialize_eNB_args))
@@ -990,18 +1187,64 @@ class OaiCiTest():

 		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_direction "{self.iperf_direction}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')

-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = []
+		for ue_name in self.ue_ids:
+			ue = cls_module_ue.Module_UE(ue_name)
+			if not ue.getIP():
+				logging.error("no IP addresses returned")
+				HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+			ues.append(ue)
 		logging.debug(ues)
-		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Iperf_Module, EPC, ue, RAN, i, len(ues)) for i, ue in enumerate(ues)]
-			results = [f.result() for f in futures]
-			# each result in results is a tuple, first member goes to successes, second to messages
-			successes, messages = map(list, zip(*results))
-		if len(successes) == len(ues) and all(successes):
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
-		else:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+
+		self.dummyIperfVersion = '2.0.10'
+		#cmd = 'iperf --version'
+		#logging.debug(cmd + '\n')
+		#iperfStdout = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+		#result = re.search('iperf version 2.0.5', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.5'
+		#result = re.search('iperf version 2.0.10', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.10'
+		multi_jobs = []
+		ue_num = len(ues)
+		i = 0
+		lock = Lock()
+		status_queue = SimpleQueue()
+		for ue in ues:
+			p = Process(target = self.Iperf_Module ,args = (lock, status_queue, EPC, ue, RAN, i, ue_num))
+			p.daemon = True
+			p.start()
+			multi_jobs.append(p)
+			i = i + 1
+		for job in multi_jobs:
+			job.join()
+
+		if (status_queue.empty()):
+			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+		else:
+			iperf_status = True
+			iperf_noperf = False
+			messages = []
+			while (not status_queue.empty()):
+				count = status_queue.get()
+				if (count < 0):
+					iperf_status = False
+				if (count > 0):
+					iperf_noperf = True
+				device_id = status_queue.get()
+				ip_addr = status_queue.get()
+				msg = status_queue.get()
+				messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{msg}')
+			if (iperf_noperf and iperf_status):
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
+			elif (iperf_status):
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
+			else:
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)

 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
 		if (not os.path.isfile(f'./{UElogFile}')):
@@ -1364,10 +1607,7 @@ class OaiCiTest():
 			for instance in range(0, len(CONTAINERS.yamlPath)):
 				if CONTAINERS.yamlPath[instance]!='':
 					CONTAINERS.eNB_instance=instance
-					if CONTAINERS.deployKind[instance]:
-						CONTAINERS.UndeployObject(HTML,RAN)
-					else:
-						CONTAINERS.UndeployGenObject(HTML,RAN, self)
+					CONTAINERS.UndeployObject(HTML,RAN)
 		RAN.prematureExit=True

 	#this function is called only if eNB/gNB fails to start
@@ -1394,10 +1634,7 @@ class OaiCiTest():
 			for instance in range(0, len(CONTAINERS.yamlPath)):
 				if CONTAINERS.yamlPath[instance]!='':
 					CONTAINERS.eNB_instance=instance
-					if CONTAINERS.deployKind[instance]:
-						CONTAINERS.UndeployObject(HTML,RAN)
-					else:
-						CONTAINERS.UndeployGenObject(HTML,RAN,self)
+					CONTAINERS.UndeployObject(HTML,RAN)
 		RAN.prematureExit=True

 	def IdleSleep(self,HTML):
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -98,15 +98,6 @@ class PhySim:
 			for line in g:
 				if 'decoding time' in line:
 					runResultsT1.append(line)
-
-		# In case the T1 board does work properly, there is no statistics
-		if len(runResultsT1) == 0:
-			logging.error('no statistics')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
-			self.exitStatus = 1
-			os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
-			return HTML
-
 		info = runResultsT1[0][15:-13]
 		result = int(''.join(filter(str.isdigit, info)))/100
 		#once parsed move the local logfile to its folder for tidiness
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -106,8 +106,7 @@ class PhySim:
 		if self.ranCommitID != '':
 			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
 		if self.ranAllowMerge:
-			branchName = self.ranBranch.replace('/','-')
-			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
 					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
@@ -161,7 +160,7 @@ class PhySim:
 		isRunning = False
 		count = 0
 		# Check whether the containers are in Running state or not under 2 mins
-		while(count < 5 and isRunning == False):
+		while(count < 2 and isRunning == False):
 			time.sleep(60)
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -283,7 +283,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with incorrect define protection ===', str(line)) is not None:
 							circularHeaderDependency = True
 						if circularHeaderDependency:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								circularHeaderDependency = False
 							elif re.search('Running in|Files with incorrect define protection', str(line)) is not None:
 								pass
@@ -293,7 +293,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with a GNU GPL licence Banner ===', str(line)) is not None:
 							gnuGplLicence = True
 						if gnuGplLicence:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								gnuGplLicence = False
 							elif re.search('Running in|Files with a GNU GPL licence Banner', str(line)) is not None:
 								pass
@@ -303,7 +303,7 @@ class StaticCodeAnalysis():
 						if re.search('=== Files with a suspect Banner ===', str(line)) is not None:
 							suspectLicence = True
 						if suspectLicence:
-							if re.search('DONE', str(line)) is not None:
+							if re.search('Removing intermediate container', str(line)) is not None:
 								suspectLicence = False
 							elif re.search('Running in|Files with a suspect Banner', str(line)) is not None:
 								pass
@@ -340,7 +340,7 @@ class StaticCodeAnalysis():
 					html_cell = f'Number of files not respecting: {len(gnuGplLicenceFiles)}\n'
 					for nFile in gnuGplLicenceFiles:
 						html_cell += str(nFile).strip() + '\n'
-					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', [html_cell])
+					HTML.CreateHtmlTestRowQueue('Files w/ GNU GPL License', 'KO', html_queue)
 					del(html_cell)
 					finalStatus = -1

--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

    }
 );  
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -19,17 +19,147 @@ gNBs =


    nr_cellid = 12345678L;
+    force_256qam_off = 1;

    tr_s_preference = "f1";

    local_s_if_name = "eth0";
-    local_s_address = "192.168.71.150";
-    remote_s_address = "192.168.71.171";
+    local_s_address = "192.168.71.140";
+    remote_s_address = "192.168.71.142";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
    remote_s_portd  = 2153;
+    min_rxtxtime                                              = 6;

+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#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;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#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,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# 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                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
    # ------- SCTP definitions
    SCTP :
    {
@@ -51,9 +181,9 @@ gNBs =
    {

        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
@@ -75,11 +205,15 @@ security = {
  drb_ciphering = "yes";
  drb_integrity = "no";
 };
-
-log_config : {
-  global_log_level = "info";
-  pdcp_log_level = "info";
-  rrc_log_level = "info";
-  f1ap_log_level = "info";
-  ngap_log_level = "info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
@@ -1,26 +1,36 @@
-Active_gNBs = ( "gNB-OAI");
+Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-
-sa = 1;
+Num_Threads_PUSCH = 8;

 gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
+    gNB_ID = 0xe00;
+
+#     cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-CU";

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

    nr_cellid = 12345678L;
+    force_256qam_off = 1;

-    ////////// Physical parameters:
+    tr_s_preference = "f1";

-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    local_s_if_name = "eth0";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
+    local_s_portc   = 501;
+    local_s_portd   = 2153;
+    remote_s_portc  = 500;
+    remote_s_portd  = 2153;
+    min_rxtxtime                                              = 6;

    servingCellConfigCommon = (
    {
@@ -31,44 +41,43 @@ gNBs =
 #  downlinkConfigCommon
    #frequencyInfoDL
      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 423130;
-      dl_frequencyBand                                                 = 1;
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 422194;
+      dl_absoluteFrequencyPointA                                       = 640008;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 0;
-        dl_carrierBandwidth                                            = 52;
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 14025;
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 0;
+        initialDLBWPsubcarrierSpacing                                   = 1;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 7;
+        initialDLBWPcontrolResourceSetZero                              = 11;
        initialDLBWPsearchSpaceZero                                     = 0;

  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                              = 1;
-      ul_absoluteFrequencyPointA                                    = 384194;
+      ul_frequencyBand                                              = 78;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 0;
-      ul_carrierBandwidth                                           = 52;
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 14025;
+        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 0;
+        initialULBWPsubcarrierSpacing                               = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
          prach_ConfigurationIndex                                  = 98;
@@ -76,8 +85,8 @@ gNBs =
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -90;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
          preambleTransMax                                          = 6;
 #powerRampingStep
@@ -88,9 +97,9 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #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                = 3;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -101,10 +110,10 @@ gNBs =
        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                                      = 0;
+        msg1_SubcarrierSpacing                                      = 1,
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0;
+        restrictedSetConfig                                         = 0,

        msg3_DeltaPreamble                                          = 1;
        p0_NominalWithGrant                                         =-90;
@@ -114,9 +123,7 @@ gNBs =
 # 0 = neither, 1= group hopping, 2=sequence hopping
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
-        p0_nominal                                                  = -70;
-        n_TimingAdvanceOffset                                       = 0;
-
+        p0_nominal                                                  = -90;
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
      ssb_PositionsInBurst_PR                                       = 2;
@@ -132,21 +139,26 @@ gNBs =

 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 0;
+      subcarrierSpacing                                             = 1;


  #tdd-UL-DL-ConfigurationCommon
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 0;
+      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                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;

      ssPBCH_BlockPower                                             = -25;
  }

  );
-
-
    # ------- SCTP definitions
    SCTP :
    {
@@ -157,82 +169,25 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+        amf_ip_address      = ( { ipv4       = "172.21.16.137";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
                            }
                          );

-
    NETWORK_INTERFACES :
    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
+
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
-
  }
 );

-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  ul_max_mcs                  = 28;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 10;
-  att_rx         = 10;
-  bands          = [1];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-}
-);
-
-THREAD_STRUCT = (
-{
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_SINGLE_THREAD";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-}
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
@@ -249,16 +204,15 @@ security = {
  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                        ="debug";
-  f1ap_log_level                        ="debug";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
@@ -1,85 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-CU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-CU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- 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.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-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";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
-       ngap_log_level                         ="info";
-    };
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -8,7 +8,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -16,21 +16,151 @@ gNBs =

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


    nr_cellid = 12345678L;
+    force_256qam_off = 1;

    tr_s_preference = "f1";

    local_s_if_name = "lo";
-    local_s_address = "192.168.71.150";
-    remote_s_address = "0.0.0.0"; # multiple DUs
+    local_s_address = "192.168.72.140";
+    remote_s_address = "192.168.72.143";
    local_s_portc   = 501;
    local_s_portd   = 2152;
    remote_s_portc  = 500;
    remote_s_portd  = 2152;
+    ssb_SubcarrierOffset                                      = 0;
+    min_rxtxtime                                              = 6;

+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#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;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#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,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# 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                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
    # ------- SCTP definitions
    SCTP :
    {
@@ -52,9 +182,9 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "192.168.71.150";
+        ipv4_cucp = "192.168.72.140";
        port_cucp = 38462;
-        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
+        ipv4_cuup = "192.168.72.141";
        port_cuup = 38462;
      }
    )
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
@@ -1,89 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- 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.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    E1_INTERFACE =
-    (
-      {
-        type = "cp";
-        ipv4_cucp = "192.168.68.194";
-        port_cucp = 38462;
-        ipv4_cuup = "192.168.68.196";
-        port_cuup = 38462;
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-    };
-  }
-);
-
-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";
-};
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -7,8 +7,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -22,12 +21,12 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "lo";
-    local_s_address = "192.168.72.161";
-    remote_s_address = "192.168.72.171";
+    local_s_address = "192.168.72.141";
+    remote_s_address = "192.168.72.142";
    local_s_portc   = 501;
-    local_s_portd   = 2153;
+    local_s_portd   = 2152;
    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
+    remote_s_portd  = 2152;

    # ------- SCTP definitions
    SCTP :
@@ -41,25 +40,48 @@ gNBs =
    (
      {
        type = "up";
-        ipv4_cucp = "192.168.71.150";
-        ipv4_cuup = "192.168.71.161";
+        ipv4_cucp = "192.168.72.140";
+        ipv4_cuup = "192.168.72.141";
      }
    )

    NETWORK_INTERFACES :
    {
        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.141/24";
        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.141/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
 );

-log_config : {
-  global_log_level = "info";
-  pdcp_log_level   = "info";
-  f1ap_log_level   = "info";
-  ngap_log_level   = "info";
+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                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="info";
+       ngap_log_level                         ="debug";
+    };
+
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
@@ -1,62 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "lo";
-    local_s_address = "192.168.68.196";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    E1_INTERFACE =
-    (
-      {
-        type = "up";
-        ipv4_cucp = "192.168.68.194";
-        ipv4_cuup = "192.168.68.196";
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-log_config: {
-  global_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
@@ -7,7 +7,6 @@ gNBs =
 {
    ////////// Identification parameters:
    gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -23,6 +22,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;

    servingCellConfigCommon = (
    {
@@ -218,7 +218,7 @@ THREAD_STRUCT = (

 rfsimulator: {
    serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs"
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -1,218 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-DU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-DU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    min_rxtxtime                                              = 6;
-
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 423130;
-      dl_frequencyBand                                                 = 1;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 422194;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 0;
-        dl_carrierBandwidth                                            = 52;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 14025; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                  = 0;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                             = 7;
-        initialDLBWPsearchSpaceZero                                    = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 1;
-      ul_absoluteFrequencyPointA                                       = 384194;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                                = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                             = 0;
-      ul_carrierBandwidth                                              = 52;
-      pMax                                                             = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                               = 14025;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                  = 0;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                     = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                               = 0;
-          prach_msg1_FrequencyStart                                    = 0;
-          zeroCorrelationZoneConfig                                    = 12;
-          preambleReceivedTargetPower                                  = -90;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                             = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                               = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                              = 4;
-#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                   = 3;
-#oneHalf (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                                         = 0,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                            = 0,
-
-        msg3_DeltaPreamble                                             = 1;
-        p0_NominalWithGrant                                            =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                              = 0;
-        hoppingId                                                      = 40;
-        p0_nominal                                                     = -70;
-        n_TimingAdvanceOffset                                          = 0;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                          = 2;
-      ssb_PositionsInBurst_Bitmap                                      = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                       = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                              = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                                = 0;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                       = 0;
-      ssPBCH_BlockPower                                             = -25;
-     }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "f1";
-    local_n_if_name = "eth0";
-    local_n_address = "192.168.68.195";
-    remote_n_address = "192.168.68.194";
-    local_n_portc   = 500;
-    local_n_portd   = 2153;
-    remote_n_portc  = 501;
-    remote_n_portd  = 2153;
-    pusch_TargetSNRx10          = 200;
-    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
-  }
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 150;
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         # The higher att for TX than RX is because we use a circulator (as for TDD),
-         # while we should use a duplexer in the FDD case. However, it uses the same setup.
-         att_tx         = 18
-         att_rx         = 0;
-         bands          = [1];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 108;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         clock_src = "internal";
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config : {
-  global_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -7,7 +7,6 @@ gNBs =
 {
    ////////// Identification parameters:
    gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,7 +14,7 @@ gNBs =

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


    nr_cellid = 12345678L;
@@ -23,6 +22,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;

    servingCellConfigCommon = (
    {
@@ -169,8 +169,8 @@ MACRLCs = (
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_if_name = "eth0";
-    local_n_address = "192.168.71.171";
-    remote_n_address = "192.168.71.150";
+    local_n_address = "192.168.71.142";
+    remote_n_address = "192.168.71.140";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
@@ -217,17 +217,21 @@ THREAD_STRUCT = (
 );
 rfsimulator: {
 serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs"
 }

-log_config: {
-  global_log_level = "info";
-  hw_log_level = "info";
-  phy_log_level = "info";
-  mac_log_level = "info";
-  rlc_log_level = "info";
-  f1ap_log_level = "info";
-};
+     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";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -7,7 +7,6 @@ gNBs =
 {
    ////////// Identification parameters:
    gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -23,6 +22,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;


    servingCellConfigCommon = (
@@ -218,6 +218,15 @@ THREAD_STRUCT = (
  }
 );

-log_config : {
-  global_log_level = "info";
-};
+     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";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -63,7 +63,6 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
-        initialDLBWPcontrolResourceSetZero                                      = 0;
      #rach-ConfigCommon
        #rach-ConfigGeneric
          prach_ConfigurationIndex                                  = 98;
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -32,7 +32,7 @@ gNBs =
      absoluteFrequencySSB                                             = 432990;
      dl_frequencyBand                                                 = 66;
      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 430002;
+      dl_absoluteFrequencyPointA                                       = 430000;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -53,7 +53,7 @@ gNBs =
  #uplinkConfigCommon
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
-      ul_absoluteFrequencyPointA                                    = 350002;
+      ul_absoluteFrequencyPointA                                    = 350000;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -230,7 +230,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
    serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -32,7 +32,7 @@ gNBs =
      absoluteFrequencySSB                                          = 430590;
      dl_frequencyBand                                              = 66;
      # this is 2150 MHz
-      dl_absoluteFrequencyPointA                                    = 430002;
+      dl_absoluteFrequencyPointA                                    = 430000;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -54,7 +54,7 @@ gNBs =
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
      # this is 1750 MHz
-      ul_absoluteFrequencyPointA                                    = 350002;
+      ul_absoluteFrequencyPointA                                    = 350000;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -240,7 +240,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

    gNB_name  =  "gNB-OAI";

@@ -220,7 +220,7 @@ RUs = (
  att_rx         = 0;
  bands          = [78];
  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 65;
+  max_rxgain                    = 75;
  eNB_instances  = [0];
  ##beamforming 1x2 matrix: 1 layer x 2 antennas
  bf_weights = [0x00007fff, 0x0000];
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -232,7 +232,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -10,7 +10,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

    gNB_name  =  "gNB-Eurecom-n78_20";

@@ -24,7 +24,7 @@ gNBs =
    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;

    servingCellConfigCommon = (
    {
@@ -75,7 +75,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                                           = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
+          prach_ConfigurationIndex                                  = 98;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -220,7 +220,7 @@ RUs = (
        tr_preference  = "udp_ecpri_if5"
        nb_tx          = 2
        nb_rx          = 2
-        att_tx         = 18
+        att_tx         = 16
        att_rx         = 0;
        num_tp_cores   = 4;
        rxfh_core_id   = 9;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -30,7 +30,7 @@ gNBs =
      absoluteFrequencySSB                                             = 620736;
      dl_frequencyBand                                                 = 78;
      # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 620052;
+      dl_absoluteFrequencyPointA                                       = 620020;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
--- a/ci-scripts/conf_files/lteue.usim-ci-magma.conf
+++ b/ci-scripts/conf_files/lteue.usim-ci-magma.conf
@@ -1,45 +0,0 @@
-# List of known PLMNS
-PLMN: {
-    PLMN0: {
-           FULLNAME="OpenAirInterface";
-           SHORTNAME="OAICN";
-           MNC="92";
-           MCC="208";
-    };
-};
-
-UE0:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="1000000003";
-        USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
-        OPC="c42449363bbad02b66d16bc975d77cc1";
-        MSISDN="001011234561010";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20892";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20892");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};
--- 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
@@ -230,7 +230,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
    serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
--- 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
@@ -229,7 +229,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -15,7 +15,7 @@ Ref :
  DLSCH encoding : 137.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
+  PUSCH decoding : 210.0
  Schedule Response : 48.0
  DL & UL scheduling timing : 13.0
  UL Indication : 60.0
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -8,14 +8,14 @@ ColNames :
  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 84.0
-  feptx_prec : 14.0
+  feptx_prec : 11.0
  feptx_ofdm : 35.0
  feptx_total : 100.0
  L1 Tx processing : 400.0
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
+  PUSCH decoding : 210.0
  Schedule Response : 111.0
  DL & UL scheduling timing : 20.0
  UL Indication : 127.0
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -15,7 +15,7 @@ Ref :
  DLSCH encoding : 118.0
  L1 Rx processing : 305.0
  PUSCH inner-receiver : 150.0
-  PUSCH decoding : 2200.0
+  PUSCH decoding : 210.0
  Schedule Response : 30.0
  DL & UL scheduling timing : 10.0
  UL Indication : 40.0
--- a/ci-scripts/doGitLabMerge.sh
+++ b/ci-scripts/doGitLabMerge.sh
@@ -135,6 +135,8 @@ then
    exit $STATUS
 fi

+git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG
+
 git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"

 STATUS=`git status | egrep -c "You have unmerged paths.|fix conflicts"`
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu20
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu20
@@ -1,35 +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 20.04
-#
-#---------------------------------------------------------------------
-
-FROM ran-base:develop as ran-tests
-
-RUN rm -Rf /oai-ran
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests
--- a/ci-scripts/docker_log_split.py
+++ b/ci-scripts/docker_log_split.py
@@ -0,0 +1,92 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+
+#-----------------------------------------------------------
+# Import Libs
+#-----------------------------------------------------------
+import sys		# arg
+import re		# reg
+import os
+import subprocess
+
+
+class SplitReport():
+	def __init__(self):
+		self.logfilename = ''
+		self.destinationFolder = ''
+
+	def split(self):
+		self.destinationFolder = self.logfilename.replace(".log","")
+		if os.path.isfile(self.logfilename):
+			newImageLog = open(self.logfilename + '.new', 'w')
+			copyFlag = True
+			with open(self.logfilename, 'r') as imageLog:
+				for line in imageLog:
+					header = False
+					ret = re.search('====== Start of log for ([0-9\.A-Za-z\-\_]+) ======', line)
+					if ret is not None:
+						copyFlag = False
+						header = True
+						detailedLogFile = open(self.destinationFolder + '/' + ret.group(1), 'w')
+					if copyFlag:
+						newImageLog.write(line)
+					ret = re.search('====== End of log for ([0-9\.A-Za-z\-\_]+) ======', line)
+					if ret is not None:
+						copyFlag = True
+						detailedLogFile.close()
+					elif not copyFlag and not header:
+						detailedLogFile.write(line)
+			imageLog.close()
+			newImageLog.close()
+			os.rename(self.logfilename + '.new', self.logfilename)
+		else:
+			print('Cannot split unfound file')
+
+#--------------------------------------------------------------------------------------------------------
+#
+# Start of main
+#
+#--------------------------------------------------------------------------------------------------------
+
+argvs = sys.argv
+argc = len(argvs)
+
+SP = SplitReport()
+
+while len(argvs) > 1:
+	myArgv = argvs.pop(1)
+	if re.match('^\-\-logfilename=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-logfilename=(.+)$', myArgv, re.IGNORECASE)
+		SP.logfilename = matchReg.group(1)
+
+SP.split()
+
+sys.exit(0)
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -643,7 +643,7 @@ class EPCManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		mySSH.command('docker-compose --version', '\$', 5)
-		result = re.search('docker-compose version 1|Docker Compose version v2', mySSH.getBefore())
+		result = re.search('docker-compose version 1', mySSH.getBefore())
 		if result is None:
 			mySSH.close()
 			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
@@ -659,7 +659,6 @@ class EPCManagement():
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/logs ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/logs ; fi', '\$', 5)
 		mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts ' + self.SourceCodePath + '/logs', '\$', 5)
-		mySSH.command('rm -f ' + self.SourceCodePath + '/*.log', '\$', 5)

 		# deploying and configuring the cassandra database
 		# container names and services are currently hard-coded.
@@ -679,7 +678,7 @@ class EPCManagement():
 			mySSH.copyout(self.IPAddress, self.UserName, self.Password, './' + self.yamlPath + '/mme.conf', self.SourceCodePath + '/scripts')
 			mySSH.command('chmod 775 entrypoint.sh', '\$', 60)
 		mySSH.command('wget --quiet --tries=3 --retry-connrefused https://raw.githubusercontent.com/OPENAIRINTERFACE/openair-hss/develop/src/hss_rel14/db/oai_db.cql', '\$', 30)
-		mySSH.command('docker-compose down -v', '\$', 60)
+		mySSH.command('docker-compose down', '\$', 60)
 		mySSH.command('docker-compose up -d db_init', '\$', 60)
 		# databases take time...
 		time.sleep(10)
@@ -831,7 +830,8 @@ class EPCManagement():
 			listOfContainers += ' prod-trf-gen'
 			nbContainers += 1

-		mySSH.command('docker-compose down -v', '\$', 60)
+		mySSH.command('docker-compose down', '\$', 60)
+		mySSH.command('docker volume prune --force || true', '\$', 60)
 		mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + listOfContainers, '\$', 10)
 		noMoreContainerNb = mySSH.getBefore().count('No such object')
 		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -65,7 +65,6 @@ import logging
 import datetime
 import signal
 import subprocess
-import traceback
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
@@ -103,7 +102,7 @@ def AssignParams(params_dict):


 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
@@ -746,157 +745,143 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
-				try:
-					if action == 'Build_eNB':
-						RAN.BuildeNB(HTML)
-					elif action == 'WaitEndBuild_eNB':
-						RAN.WaitBuildeNBisFinished(HTML)
-					elif action == 'Custom_Command':
-						RAN.CustomCommand(HTML)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_eNB':
-						RAN.InitializeeNB(HTML, EPC)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_eNB':
-						RAN.TerminateeNB(HTML, EPC)
-					elif action == 'Initialize_UE':
-						CiTestObj.InitializeUE(HTML)
-					elif action == 'Terminate_UE':
-						CiTestObj.TerminateUE(HTML)
-					elif action == 'Attach_UE':
-						CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
-					elif action == 'Detach_UE':
-						CiTestObj.DetachUE(HTML)
-					elif action == 'DataDisable_UE':
-						CiTestObj.DataDisableUE(HTML)
-					elif action == 'DataEnable_UE':
-						CiTestObj.DataEnableUE(HTML)
-					elif action == 'CheckStatusUE':
-						CiTestObj.CheckStatusUE(HTML)
-					elif action == 'Build_OAI_UE':
-						CiTestObj.BuildOAIUE(HTML)
-					elif action == 'Initialize_OAI_UE':
-						CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_OAI_UE':
-						CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Ping':
-						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Iperf':
-						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_HSS':
-						EPC.InitializeHSS(HTML)
-					elif action == 'Terminate_HSS':
-						EPC.TerminateHSS(HTML)
-					elif action == 'Initialize_MME':
-						EPC.InitializeMME(HTML)
-					elif action == 'Terminate_MME':
-						EPC.TerminateMME(HTML)
-					elif action == 'Initialize_SPGW':
-						EPC.InitializeSPGW(HTML)
-					elif action == 'Terminate_SPGW':
-						EPC.TerminateSPGW(HTML)
-					elif action == 'Initialize_5GCN':
-						EPC.Initialize5GCN(HTML)
-					elif action == 'Terminate_5GCN':
-						EPC.Terminate5GCN(HTML)
-					elif action == 'Deploy_EPC':
-						EPC.DeployEpc(HTML)
-					elif action == 'Undeploy_EPC':
-						EPC.UndeployEpc(HTML)
-					elif action == 'IdleSleep':
-						CiTestObj.IdleSleep(HTML)
-					elif action == 'Perform_X2_Handover':
-						CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
-					elif action == 'Build_PhySim':
-						HTML=ldpc.Build_PhySim(HTML,CONST)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCTest':
-						HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCt1Test':
-						HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_NRulsimTest':
-						HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Pull_Cluster_Image':
-						if not CLUSTER.PullClusterImage(HTML,RAN):
-							RAN.prematureExit = True
-					elif action == 'Build_Cluster_Image':
-						if not CLUSTER.BuildClusterImage(HTML):
-							RAN.prematureExit = True
-					elif action == 'Build_Image':
-						success = CONTAINERS.BuildImage(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Run_Tests':
-						success = CONTAINERS.BuildRunTests(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Proxy':
-						success = CONTAINERS.BuildProxy(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Push_Local_Registry':
-						success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Pull_Local_Registry':
-						success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Clean_Test_Server_Images':
-						success = CONTAINERS.Clean_Test_Server_Images(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Object':
-						CONTAINERS.DeployObject(HTML, EPC)
-						if CONTAINERS.exitStatus==1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Undeploy_Object':
-						CONTAINERS.UndeployObject(HTML, RAN)
-						if CONTAINERS.exitStatus == 1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Cppcheck_Analysis':
-						SCA.CppCheckAnalysis(HTML)
-					elif action == 'LicenceAndFormattingCheck':
-						ret = SCA.LicenceAndFormattingCheck(HTML)
-						if ret != 0:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Run_PhySim':
-						PHYSIM.Deploy_PhySim(HTML, RAN)
-					elif action == 'DeployGenObject':
-						CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'UndeployGenObject':
-						CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'IperfFromContainer':
-						CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'StatsFromGenObject':
-						CONTAINERS.StatsFromGenObject(HTML)
-					elif action == 'Push_Images_To_Test_Servers':
-						logging.debug('To be implemented')
-					else:
-						sys.exit('Invalid class (action) from xml')
-				except Exception as e:
-					s = traceback.format_exc()
-					logging.error(f'while running CI, an exception occurred:\n{s}')
-					HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
-					RAN.prematureExit = True
-
+				if action == 'Build_eNB':
+					RAN.BuildeNB(HTML)
+				elif action == 'WaitEndBuild_eNB':
+					RAN.WaitBuildeNBisFinished(HTML)
+				elif action == 'Custom_Command':
+					logging.info(f"Executing custom command")
+					RAN.CustomCommand(HTML)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_eNB':
+					RAN.InitializeeNB(HTML, EPC)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_eNB':
+					RAN.TerminateeNB(HTML, EPC)
+				elif action == 'Initialize_UE':
+					CiTestObj.InitializeUE(HTML)
+				elif action == 'Terminate_UE':
+					CiTestObj.TerminateUE(HTML)
+				elif action == 'Attach_UE':
+					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
+				elif action == 'Detach_UE':
+					CiTestObj.DetachUE(HTML)
+				elif action == 'DataDisable_UE':
+					CiTestObj.DataDisableUE(HTML)
+				elif action == 'DataEnable_UE':
+					CiTestObj.DataEnableUE(HTML)
+				elif action == 'CheckStatusUE':
+					CiTestObj.CheckStatusUE(HTML)
+				elif action == 'Build_OAI_UE':
+					CiTestObj.BuildOAIUE(HTML)
+				elif action == 'Initialize_OAI_UE':
+					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_OAI_UE':
+					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Ping':
+					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Iperf':
+					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_HSS':
+					EPC.InitializeHSS(HTML)
+				elif action == 'Terminate_HSS':
+					EPC.TerminateHSS(HTML)
+				elif action == 'Initialize_MME':
+					EPC.InitializeMME(HTML)
+				elif action == 'Terminate_MME':
+					EPC.TerminateMME(HTML)
+				elif action == 'Initialize_SPGW':
+					EPC.InitializeSPGW(HTML)
+				elif action == 'Terminate_SPGW':
+					EPC.TerminateSPGW(HTML)
+				elif action == 'Initialize_5GCN':
+					EPC.Initialize5GCN(HTML)
+				elif action == 'Terminate_5GCN':
+					EPC.Terminate5GCN(HTML)
+				elif action == 'Deploy_EPC':
+					EPC.DeployEpc(HTML)
+				elif action == 'Undeploy_EPC':
+					EPC.UndeployEpc(HTML)
+				elif action == 'IdleSleep':
+					CiTestObj.IdleSleep(HTML)
+				elif action == 'Perform_X2_Handover':
+					CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
+				elif action == 'Build_PhySim':
+					HTML=ldpc.Build_PhySim(HTML,CONST)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCt1Test':
+					HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_NRulsimTest':
+					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Pull_Cluster_Image':
+					if not CLUSTER.PullClusterImage(HTML,RAN):
+						RAN.prematureExit = True
+				elif action == 'Build_Cluster_Image':
+					if not CLUSTER.BuildClusterImage(HTML):
+						RAN.prematureExit = True
+				elif action == 'Build_Image':
+					CONTAINERS.BuildImage(HTML)
+				elif action == 'Build_Proxy':
+					CONTAINERS.BuildProxy(HTML)
+				elif action == 'Push_Local_Registry':
+					success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Pull_Local_Registry':
+					success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Clean_Test_Server_Images':
+					success = CONTAINERS.Clean_Test_Server_Images(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Object':
+					CONTAINERS.DeployObject(HTML, EPC)
+					if CONTAINERS.exitStatus==1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Undeploy_Object':
+					CONTAINERS.UndeployObject(HTML, RAN)
+					if CONTAINERS.exitStatus == 1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Cppcheck_Analysis':
+					SCA.CppCheckAnalysis(HTML)
+				elif action == 'LicenceAndFormattingCheck':
+					ret = SCA.LicenceAndFormattingCheck(HTML)
+					if ret != 0:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Run_PhySim':
+					PHYSIM.Deploy_PhySim(HTML, RAN)
+				elif action == 'DeployGenObject':
+					CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'UndeployGenObject':
+					CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'IperfFromContainer':
+					CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'StatsFromGenObject':
+					CONTAINERS.StatsFromGenObject(HTML)
+				elif action == 'Push_Images_To_Test_Servers':
+					logging.debug('To be implemented')
+				else:
+					sys.exit('Invalid class (action) from xml')
 				if RAN.prematureExit:
 					if CiTestObj.testCase_id == CiTestObj.testMinStableId:
 						logging.warning('Scenario has reached minimal stability point')
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -260,7 +260,6 @@ class RANManagement():
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML)

 	def CustomCommand(self, HTML):
-		logging.info(f"Executing custom command on {self.node}")
 		cmd = cls_cmd.getConnection(self.node)
 		ret = cmd.run(self.command)
 		cmd.close()
@@ -992,7 +991,7 @@ class RANManagement():
 				NSA_RAPROC_PUSCH_check = 1

 			# Collect information on UE DLSCH and ULSCH statistics
-			keys = {'dlsch_rounds','ulsch_rounds'}
+			keys = {'dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'}
 			for k in keys:
 				result = re.search(k, line)
 				if result is None:
@@ -1161,7 +1160,7 @@ class RANManagement():
 				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+)')
+				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)')


 			#real time statistics
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -34,7 +34,6 @@
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
-  - Build_Run_Tests
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+                <proxy_commit>a2fa216</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -32,7 +32,7 @@
 000001
 000002
 000003
- 000004
+ 000011
 200000
 020001
 020002
@@ -82,10 +82,10 @@
                <nb_healthy>10</nb_healthy>
        </testCase>

-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE</desc>
-                <id>l2sim4g_ue</id>
+        <testCase id="000011">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -27,10 +27,14 @@
        <TestCaseRequestedList>
 111111
 100021
+ 000020
 000021
 000022
 000023
+ 000024
 020021
+ 020022
+ 030021
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -39,41 +43,83 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
        </testCase>

        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf</services>
-                <nb_healthy>4</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
+                <desc>Deploy OAI 5G CU-CP RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
-                <nb_healthy>11</nb_healthy>
+                <services>oai-cucp</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000023">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G CU-UP and DU RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <services>oai-cuup oai-du</services>
+                <nb_healthy>9</nb_healthy>
+        </testCase>
+
+        <testCase id="000024">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
-                <nb_healthy>14</nb_healthy>
+                <services>oai-nr-ue</services>
+                <nb_healthy>10</nb_healthy>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
-                <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <ping_args> -c 20 12.1.1.1 -i0.25</ping_args>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.73.135</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

+        <testCase id="020022">
+                <class>Ping</class>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="030021">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
+        </testCase>
+
+        <testCase id="030022">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.73.135 -u -i 1 -t 30 -b 1M</client_options>
+        </testCase>
+
        <testCase id="100021">
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down-e1</htmlTabRef>
-        <htmlTabName>CleanUp E1+F1 split</htmlTabName>
+        <htmlTabName>CleanUp CUCP-CUUP-DU E1+F1 split</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100022
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -27,11 +27,14 @@
        <TestCaseRequestedList>
 111111
 100021
+ 000020
 000021
 000022
+ 000023
+ 000024
 020021
+ 020022
 030021
- 030022
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -40,30 +43,62 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
        </testCase>

        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
+                <desc>Deploy OAI 5G CU RF sim SA</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu oai-du oai-nr-ue</services>
+                <services>oai-cu</services>
+                <nb_healthy>7</nb_healthy>
+        </testCase>
+
+        <testCase id="000023">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G DU RF sim SA</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-du</services>
                <nb_healthy>8</nb_healthy>
        </testCase>

+        <testCase id="000024">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>9</nb_healthy>
+        </testCase>
+
        <testCase id="020021">
                <class>Ping</class>
-                <desc>Ping ext-dn from all NR-UEs</desc>
+                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="020022">
+                <class>Ping</class>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

@@ -73,7 +108,7 @@
                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
        </testCase>

        <testCase id="030022">
@@ -82,7 +117,7 @@
                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

        <testCase id="100021">
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -44,7 +44,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000010">
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000012">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000013">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020011">
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -32,7 +32,7 @@
 000001
 000002
 000003
- 000004
+ 000011
 200000
 020001
 020002
@@ -45,7 +45,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
@@ -60,8 +60,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -69,7 +69,7 @@
                <desc>Deploy OAI 5G gNB L2 sim SA</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -77,13 +77,13 @@
                <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>proxy oai-nr-ue0</services>
-                <nb_healthy>8</nb_healthy>
+                <nb_healthy>9</nb_healthy>
        </testCase>

-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE</desc>
-                <id>l2sim5g_ue</id>
+        <testCase id="000011">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -28,20 +28,15 @@
        <TestCaseRequestedList>
 111111
 100001
+ 000000
 000001
 000002
 000003
 000004
- 000005
- 000006
- 000007
- 000008
 020001
 020002
 020003
 020004
- 020105
- 444445
 030001
 030002
 444444
@@ -49,7 +44,7 @@
 020005
 444444
 333333
- 020006
+ 020005
 100001
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -58,15 +53,23 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
        </testCase>

        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -74,7 +77,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -82,7 +85,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="000004">
@@ -90,37 +93,7 @@
                <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue2</services>
-                <nb_healthy>8</nb_healthy>
-        </testCase>
-
-        <testCase id="000005">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-                <nb_healthy>11</nb_healthy>
-        </testCase>
-
-        <testCase id="000006">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-                <nb_healthy>14</nb_healthy>
-        </testCase>
-
-        <testCase id="000007">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nr-ue9 oai-nr-ue10</services>
-                <nb_healthy>16</nb_healthy>
-        </testCase>
-
-        <testCase id="000008">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+                <nb_healthy>9</nb_healthy>
        </testCase>

        <testCase id="020001">
@@ -163,22 +136,6 @@
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

-        <testCase id="020006">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <ping_args>-c 20 192.168.72.135</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020105">
-                <class>Ping</class>
-                <desc>Ping ext-dn from all UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <ping_args>-c 100 192.168.72.135 -i 0.2 -s 1016</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
        <testCase id="030001">
                <class>IperfFromContainer</class>
                <desc>Iperf UDP Downlink</desc>
@@ -209,12 +166,6 @@
                <id>rfsim5g_ue rfsim5g_ue2</id>
        </testCase>

-        <testCase id="444445">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UE 2 to 10</desc>
-                <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-        </testCase>
-
        <testCase id="100001">
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -44,7 +44,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -44,7 +44,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100011
- 004000
 000010
 000011
 020011
@@ -43,14 +42,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000010">
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
@@ -26,7 +26,6 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100012
- 004000
 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -37,13 +36,6 @@
                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
        </testCase>

-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
-        </testCase>
-
        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <desc>Clean Test Images on Test Server</desc>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 004000
 000000
 000001
 020001
@@ -41,14 +40,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
@@ -26,7 +26,6 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
- 004000
 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -37,13 +36,6 @@
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
-        </testCase>
-
        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <desc>Clean Test Images on Test Server</desc>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 004000
 000000
 000001
 020001
@@ -41,14 +40,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-        <testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
@@ -26,7 +26,6 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
- 004000
 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -37,13 +36,6 @@
                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
-        </testCase>
-
        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <desc>Clean Test Images on Test Server</desc>
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -44,7 +44,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000000">
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_build_run_tests.xml
+++ b/ci-scripts/xml_files/container_build_run_tests.xml
@@ -1,40 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>build-run-test-tab</htmlTabRef>
-	<htmlTabName>Build and Run Unit Tests</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030201">
-		<class>Build_Run_Tests</class>
-		<desc>Build and Run UnitTests</desc>
-		<kind>all</kind>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_image_build_cross.xml
+++ b/ci-scripts/xml_files/container_image_build_cross.xml
@@ -1,41 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>build-tab</htmlTabRef>
-	<htmlTabName>Build Container Images</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 000001
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000001">
-		<class>Build_Image</class>
-		<desc>Cross-Compile for ARM64</desc>
-		<kind>build_cross_arm64</kind>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+                <proxy_commit>a2fa216</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -120,7 +120,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
    </testCase>
@@ -179,7 +178,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>single-ue</iperf_profile>
        <direction>UL</direction>
        <id>adb_ue_1</id>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -128,7 +128,6 @@
        <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
    </testCase>
@@ -157,7 +156,6 @@
        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>UL</direction>
        <id>adb_ue_1 adb_ue_2</id>
@@ -168,7 +166,6 @@
        <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
        <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>single-ue</iperf_profile>
        <direction>UL</direction>
        <id>adb_ue_1</id>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -114,7 +114,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -107,7 +107,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
@@ -1,174 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-    <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-100001
-111110
-111111
-030111
-000001
-030311
-000002
-040511 040613 040616 040651
-030411
-000001
-030211
-200000
-200001
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
-    </testCase>
-    <testCase id="111111">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>1</test_svr_id>
-        <images_to_pull>oai-lte-ue</images_to_pull>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="100001">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="200001">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-
-    <testCase id="030111">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030311">
-        <class>Deploy_Object</class>
-        <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="000002">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030411">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy LTE-UE</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-    <testCase id="040511">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20 192.168.61.200</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040613">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040616">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040651">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
@@ -1,45 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-    <htmlTabRef>images-clean-up</htmlTabRef>
-    <htmlTabName>Images Clean-Up</htmlTabName>
-    <htmlTabIcon>trash</htmlTabIcon>
-    <TestCaseRequestedList>
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on eNB Test Server</desc>
-        <test_svr_id>0</test_svr_id>
-    </testCase>
-
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on LTE-UE Test Server</desc>
-        <test_svr_id>1</test_svr_id>
-    </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -113,7 +113,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
        <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -121,7 +121,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -129,7 +129,6 @@
        <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
        <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -111,7 +111,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
        <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -113,7 +113,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>balanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
@@ -124,7 +123,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>single-ue</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1</id>
@@ -135,7 +133,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
        <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
        <iperf_profile>unbalanced</iperf_profile>
        <direction>DL</direction>
        <id>adb_ue_1 adb_ue_2</id>
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -185,8 +185,8 @@

 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -35,11 +35,6 @@
    002003
    002004
    002005
-    002006
-    002007
-    002008
-    002009
-    002010
    000100
    000010
    000020
@@ -102,42 +97,12 @@
    <id>amarisoft_ue_5</id>
  </testCase>

-  <testCase id="002006">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_6</id>
-  </testCase>
-
-  <testCase id="002007">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_7</id>
-  </testCase>
-
-  <testCase id="002008">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_8</id>
-  </testCase>
-
-  <testCase id="002009">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_9</id>
-  </testCase>
-
-  <testCase id="002010">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_10</id>
-  </testCase>
-
  <testCase id="000010">
    <class>Iperf</class>
-    <desc>iperf (DL/7Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 70M -t 30 -i 1 -R</iperf_args>
+    <desc>iperf (DL/20Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 60M -t 30 -i 1 -R</iperf_args>
    <direction>IPERF3</direction>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3</id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
    <iperf_profile>balanced</iperf_profile>
@@ -145,10 +110,10 @@

  <testCase id="000020">
    <class>Iperf</class>
-    <desc>iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 36M -t 30 -i 1 </iperf_args>
+    <desc>iperf (UL/5Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 15M -t 30 -i 1 </iperf_args>
    <direction>IPERF3</direction>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3</id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
    <iperf_profile>balanced</iperf_profile>
@@ -157,7 +122,7 @@
  <testCase id="000100">
    <class>Ping</class>
    <desc>Ping: 20pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>25</ping_rttavg_threshold>
@@ -166,7 +131,7 @@
  <testCase id="000200">
    <class>Ping</class>
    <desc>Ping: 100pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
    <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>30</ping_rttavg_threshold>
@@ -175,7 +140,7 @@
  <testCase id="003000">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5</id>
  </testCase>

  <testCase id="004000">
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -111,7 +111,7 @@
  <testCase id="000002">
    <class>IdleSleep</class>
    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
  </testCase>


@@ -168,14 +168,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="060002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1 reconf_after_reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -1,166 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-F1-E1-B200</htmlTabRef>
-  <htmlTabName>40 MHz TDD F1+E1 SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    333333
-    300000
-    310000
-    330101
-    330102
-    330103
-    310001
-    350000
-    370001
-    370000
-    370002
-    310011
-    310002
-    330201
-    200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="333333">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-gnb oai-nr-cuup</images_to_pull>
-  </testCase>
-
-  <testCase id="310000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="310002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="310001">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-  <testCase id="310011">
-    <class>Detach_UE</class>
-    <desc>Detach Quectel</desc>
-    <id>idefix</id>
-  </testCase>
-
-  <testCase id="330101">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-CU-CP in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <services>gnb_cucp</services>
-  </testCase>
-
-  <testCase id="330102">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-CU-UP in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <services>gnb_cuup</services>
-  </testCase>
-
-  <testCase id="330103">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU (TDD/Band78/40MHz/B200) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <services>gnb_du_tdd</services>
-  </testCase>
-
-  <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Disable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Enable Sleep States</desc>
-    <node>ofqot</node>
-    <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="350000">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>idefix</id>
-    <ping_args>-c 20 %cn_ip%</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="370000">
-    <class>Iperf</class>
-    <desc>iperf (DL/80Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
-    <direction>DL</direction>
-    <id>idefix</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="370001">
-    <class>Iperf</class>
-    <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
-    <direction>UL</direction>
-    <id>idefix</id>
-    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="370002">
-    <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
-    <iperf_args>-t 20 --bidir</iperf_args>
-    <direction>BIDIR</direction>
-    <id>idefix</id>
-    <iperf_profile>single-ue</iperf_profile>
-  </testCase>
-
-  <testCase id="330201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy CU-DU</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>10,100,100,100</d_retx_th>
-    <u_retx_th>10,100,100,100</u_retx_th>
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
@@ -1,48 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-F1-E1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-  330201
-  222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="330201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy CU-CP/CU-UP/DU</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
  <htmlTabRef>TEST-SA-FR1-F1-B200</htmlTabRef>
-  <htmlTabName>10 MHz FDD F1 SA</htmlTabName>
+  <htmlTabName>40 MHz TDD F1 SA</htmlTabName>
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
@@ -39,22 +39,22 @@
    110011
    110001
    150001
-    160001
-    100002
-    160002
-    150001
    110011
    110001
    150000
-    170001
-    170000
-    170002
    110011
    110002
    100001
    130201
    200000
  </TestCaseRequestedList>
+    <!--
+ 070001
+ 070000
+ 070002
+ 050002
+ 050003
+    -->
  <TestCaseExclusionList></TestCaseExclusionList>

  <testCase id="110000">
@@ -89,11 +89,11 @@

  <testCase id="130102">
    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU (FDD/Band1/10MHz/B200) in a container</desc>
+    <desc>Deploy gNB-DU (TDD/Band78/40MHz/B200) in a container</desc>
    <yaml_path>ci-scripts/yaml_files/sa_f1_b200_gnb</yaml_path>
    <eNB_instance>0</eNB_instance>
    <eNB_serverId>0</eNB_serverId>
-    <services>gnb_du_fdd</services>
+    <services>gnb_du_tdd</services>
  </testCase>

  <testCase id="100000">
@@ -118,7 +118,7 @@
  <testCase id="100002">
    <class>IdleSleep</class>
    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
  </testCase>

  <testCase id="150000">
@@ -159,19 +159,19 @@

  <testCase id="170000">
    <class>Iperf</class>
-    <desc>iperf (DL/50Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 50M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
    <direction>DL</direction>
    <id>idefix</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

  <testCase id="170001">
    <class>Iperf</class>
-    <desc>iperf (UL/25Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 25M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 8M -t 60 -i 1 -fm</iperf_args>
    <direction>UL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
@@ -181,36 +181,21 @@

  <testCase id="170002">
    <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-t 60 --bidir</iperf_args>
+    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
+    <iperf_args>-t 10 --bidir</iperf_args>
    <direction>BIDIR</direction>
    <id>idefix</id>
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

-  <testCase id="160001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU)</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-  <testCase id="160002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
  <testCase id="130201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-DU</desc>
    <yaml_path>ci-scripts/yaml_files/sa_f1_b200_gnb</yaml_path>
    <eNB_instance>0</eNB_instance>
    <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>10,100,100,100</d_retx_th>
-    <u_retx_th>10,100,100,100</u_retx_th>
+    <d_retx_th>1,100,100,100</d_retx_th>
+    <u_retx_th>1,100,100,100</u_retx_th>
  </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
@@ -27,6 +27,7 @@
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
  230201
+  222222
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

@@ -38,4 +39,10 @@
    <eNB_serverId>0</eNB_serverId>
  </testCase>

+  <testCase id="222222">
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <test_svr_id>0</test_svr_id>
+  </testCase>
+
 </testCaseList>
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -105,7 +105,7 @@
  <testCase id="200002">
    <class>IdleSleep</class>
    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
  </testCase>


@@ -129,8 +129,8 @@

  <testCase id="270000">
    <class>Iperf</class>
-    <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/100Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 100M -t 30 -i 1 -fm</iperf_args>
    <direction>DL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
@@ -162,14 +162,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="260002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1 reconf_after_reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
@@ -52,7 +52,7 @@
        <testCase id="090102">
                <class>Initialize_OAI_UE</class>
                <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
        </testCase>

--- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml
+++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml
@@ -52,7 +52,7 @@
        <testCase id="090104">
                <class>Initialize_OAI_UE</class>
                <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75  --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 75  --rrc_config_path . --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
        </testCase>

--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -35,7 +35,7 @@
 		<mode>TesteNB</mode>	
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
-		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib "ldpc_cuda" --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib "ldpc_cuda ldpc_t1" --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
 		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ejaz Ahmed	b900b38448	Fixed merge conflicts	2024-08-02 02:14:49 +00:00
Ejaz Ahmed	35f918effd	Created initial data structures for HARQ Following changes are made: 1) Added essential data structures for HARQ 2) Moved gNB specific list functions to common file 3) Implemented preconfigurations for HARQ 4) Developed thread lock functions for NR_UE_SL_SCHED 5) Included header files for common moved functions in gNB code	2024-07-31 15:38:21 +00:00
Ejaz Ahmed	af49a21e95	Fixed order of SL UE phy params initializations	2024-07-31 15:37:55 +00:00
Ejaz Ahmed	093b212878	Fixed PSFCH issue in sci_payload in case of psfch_period zero	2024-07-31 15:37:18 +00:00
Ejaz Ahmed	b7e2cb3c93	Fixed line spacing	2024-07-31 15:37:00 +00:00
Ejaz Ahmed	396d8f6eb5	Added PSFCH in sci_payload	2024-07-31 15:36:42 +00:00
Ejaz Ahmed	12c1fb2069	Added code to send synchronization information from nearby to syncref Added code to send synchronization information from nearby to syncref within reserved bit of sci1. Syncref starts sending SLSCH once syncref receives synchronization information.	2024-07-31 15:36:04 +00:00
Melissa	15f8f5aeea	Merge branch 'episys/ea/nearby_ue_sync_ref_ue_indication' into 'episys/sl-eurecom2' Added code to send sync information from nearby to syncref See merge request aburger/openairinterface5g!277	2024-07-11 19:08:35 +00:00
Ejaz Ahmed	30ce40cf03	Fixed PSFCH issue in sci_payload in case of psfch_period zero	2024-07-10 19:51:30 +00:00
Ejaz Ahmed	23300df806	Fixed line spacing	2024-07-10 18:10:03 +00:00
Ejaz Ahmed	d9acb85bfa	Added PSFCH in sci_payload	2024-07-10 17:58:43 +00:00
Ejaz Ahmed	ec7b44e6dd	Added code to send synchronization information from nearby to syncref Added code to send synchronization information from nearby to syncref within reserved bit of sci1. Syncref starts sending SLSCH once syncref receives synchronization information.	2024-07-08 19:58:36 +00:00
Ejaz Ahmed	07e1e3a968	Updated Tx params based on CQI report; Enabled support for MCS 1-16; Fixed SNR estimation Following changes are made in this merge: 1) Updated Tx params based on received CQI report 2) Added SNR estimation based on signal power and noise power 3) Modified calculation of G to support MCS 1-16: G calculation method is modified in nr_get_G_SL to support different modulation orders, (Qm = 2 or 4), while keeping modulation order of 2 for dmrs, sci1 and sci2 4) In case of modulation order of 4, symbol 1 was crashing while reading rxF in nr_ulsch_16qam_llr() due to null pointer: fixed by introducing temp variable for recreating the symbol by inserting zeros on SCI1 and SCI2 REs, then complete symbol is passed for LLR computation along with a temporary LLR variable to collect the output of the LLR function for symbol 1. Next LLRs output related to Zero portions (SCI1 and SCI2 REs) of input is trimmed and passed only the LLR output of SLSCH REs to layer de-mapping function 5) Changed data rate computation for SCI2 based on fixed mcs (equivalent to mod_order of 2) at both rx and tx 6) Updated format of sci2 in nr_sci_size() on rx to make the sci2_payload_len same as on tx side 7) Replaced array index expression of a list, holding CQI data structure, with a variable 8) Moved CQI tables and functions from gNB files to common mac file so that both gNB and UE can access. 9) Tested on RFSIM with channel model AWGN noise power of -10 and ploss of 5 10) Cleaned code	2024-06-20 14:44:17 +00:00
Ejaz Ahmed	cc7c0b7968	Updated configurations; formatted logs	2024-06-20 14:25:36 +00:00
Melissa	076c83b6f2	Merge branch 'episys/ea/Fixed_SNR_and_MCS_1_16_issues' into 'episys/sl-eurecom2' Enabled support for MCS 1-16; Fixed SNR estimation See merge request aburger/openairinterface5g!276	2024-06-20 13:49:47 +00:00
Ejaz Ahmed	616f759661	Enabled support for MCS 1-16; Fixed SNR estimation	2024-06-20 13:49:47 +00:00
matilde.costa	61e62abb7f	Added non-ip types to ip_traffic_type_t	2024-06-06 14:06:28 +00:00
Ejaz Ahmed	bb35caebed	Fixed interface's name conflicts; restricted tx and rx operations in specific slots to fix an issue in USRP.	2024-06-06 13:56:59 +00:00
Melissa	1ff86924ff	Merge branch 'episys/ea/usrp_debugging_psfch_csi_rs' into 'episys/sl-eurecom2' Fixed interface's name conflicts; restricted tx and rx operations in specific slots to fix an issue in USRP. See merge request aburger/openairinterface5g!274	2024-05-30 22:38:11 +00:00
Ejaz Ahmed	e13e26759e	Fixed interface's name conflicts; restricted tx and rx operations in specific slots to fix an issue in USRP.	2024-05-30 22:38:11 +00:00
matilde.costa	9588e10de0	Added non-ip types to ip_traffic_type_t	2024-05-17 14:58:54 +02:00
Ejaz Ahmed	885d5cd426	Updated logs & fixed spacing issues	2024-05-03 16:48:43 -07:00
Matilde Costa	6536425c4b	rlc/pdcp threads with -1 affinity	2024-05-03 16:30:53 -07:00
Ejaz Ahmed	c7e08dffbe	Added separate conf files for sync_ref & nearby ue; reverted tx scheduling conditions	2024-05-03 16:23:03 -07:00
Ejaz Ahmed	d2475e0dd6	Added separate conf files for sync_ref & nearby ue; reverted tx scheduling conditions	2024-05-01 16:46:52 -07:00
Ejaz Ahmed	c584baf9e1	Merge branch 'episys/sl-eurecom2' into eurecom/sl-eurecom2 Following modifications are included in this merge: 1) Implemented CSI reporting 2) Developed a measurement function of SNR and computed CQI based on that 3) Simplified functions 4) Improved logging 5) Cleaned code 6) Fixed pointers issues	2024-04-30 10:52:54 -07:00
Melissa	6fcda3dcc0	Merge branch 'episys/ea/5g_sidelink_csi' into 'episys/sl-eurecom2' Implemented measurement of SNR and computed CQI; Updated tx and rx code of CSI reporting See merge request aburger/openairinterface5g!273	2024-04-30 15:50:27 +00:00
Ejaz Ahmed	3e81184deb	Implemented measurement of SNR and computed CQI; Updated tx and rx code of CSI reporting	2024-04-30 15:50:27 +00:00
matilde.costa	4e2b8ddb92	fix nas_config in rrc sl preconfiguration for tun interface name	2024-04-25 15:39:15 +02:00
Matilde Costa	e8ca12049a	rlc/pdcp threads with -1 affinity	2024-04-25 11:08:02 +02:00
Raymond Knopp	e9ff59611d	check of PSFCH pointer in ue_scheduler	2024-04-28 21:42:27 +02:00
Raymond Knopp	fb6baf3f76	check for PSFCH pointer definition	2024-04-28 21:26:19 +02:00
Raymond Knopp	18e9694f31	more debugging removal	2024-04-22 16:19:47 +02:00
Raymond Knopp	183e029c8c	removed some logging	2024-04-22 16:16:37 +02:00
Raymond Knopp	da97a8f016	debugging info	2024-04-22 15:47:24 +02:00
Raymond Knopp	1a470d5af6	logging for debug	2024-04-26 16:52:15 +02:00
Ejaz Ahmed	c4250dcd2b	Fixed MAC subpdu header; fixed multiple interface issue	2024-04-19 11:56:47 -07:00
Ejaz Ahmed	4c4a667fd6	Bug fixed and freed memorey in case of no psfch; set two interfaces	2024-04-19 11:31:44 -07:00
Melissa	da6f3251f3	Merge branch 'episys/ea/fix_mac_subheaders_length_issue' into 'episys/sl-eurecom2' Fixed NR_SLSCH_MAC_SUBHEADER processing issue See merge request aburger/openairinterface5g!272	2024-04-19 16:53:50 +00:00
Raymond Knopp	c534570eec	added srcid to nas_config for SL	2024-04-19 16:27:32 +02:00
Raymond Knopp	9642a70e6d	testing and bugfixing	2024-04-19 16:10:35 +02:00
Raymond Knopp	1c84699e00	handled freeing of PSFCH information in case PSFCH_Period = 0	2024-04-23 06:07:18 +02:00
Ejaz Ahmed	9d8db83ebd	Fixed spacing	2024-04-18 16:11:54 -07:00
Ejaz Ahmed	9ceb3ddf93	Merge branch 'episys/sl-eurecom2' into episys/ea/fix_mac_subheaders_length_issue	2024-04-18 16:08:07 -07:00
Melissa	289991b0fe	Merge branch 'episys/ea/fix_errors_with_disabled_psfch' into 'episys/sl-eurecom2' Enabled No PSFCH Support See merge request aburger/openairinterface5g!271	2024-04-18 22:21:44 +00:00
Ejaz Ahmed	38a43f3be6	Updated comment	2024-04-18 13:06:40 -07:00
Ejaz Ahmed	6fc72eae0f	Reverted the debugging logs	2024-04-18 13:00:58 -07:00
Ejaz Ahmed	14420f24cb	Additional conditions on rx csi-rs scheduling	2024-04-18 11:59:50 -07:00
Ejaz Ahmed	53aa746075	Fixing errors in case of 12 PSSCH symbols and 3 PSCCH channels	2024-04-17 19:50:15 -07:00
Ejaz Ahmed	4e10e4fa2c	Fixed MAC subPDU header length issue	2024-04-17 11:59:34 -07:00
Ejaz Ahmed	9879c13cd4	Added option in conf file to activate/deactivate csi-rs	2024-04-17 10:36:00 -07:00
Ejaz Ahmed	63454cebf8	Added option in conf file to activate/deactivate csi-rs	2024-04-17 10:30:31 -07:00
Ejaz Ahmed	813b600305	Implemented CSI-RS transmission and reception.	2024-04-16 19:26:01 -07:00
Ejaz Ahmed	9f9dadf621	Replaced slots per frame variable to use appropriate one	2024-04-16 19:25:23 -07:00
Melissa	bb13bfa195	Merge branch 'episys/ea/5g_sidelink_csi_rs' into 'episys/sl-eurecom2' Implemented CSI-RS transmission and reception. See merge request aburger/openairinterface5g!270	2024-04-16 22:43:25 +00:00
Ejaz Ahmed	ee7244ca05	Implemented CSI-RS transmission and reception.	2024-04-16 22:43:25 +00:00
Ejaz Ahmed	05604174e0	Replaced slots per frame variable to use appropriate one	2024-03-19 12:22:35 -07:00
Ejaz Ahmed	cbcd09cbca	Merge branch 'episys/ea/mac_headers_validation' into episys/sl-eurecom2	2024-02-23 08:35:42 -08:00
Ejaz Ahmed	4af8be50bd	Added condition to check remaining buffer before creating MAC CE	2024-02-23 08:34:43 -08:00
Ejaz Ahmed	ef9f804da7	Adjusted loop execution to fix muliple SDUs placement before MAC CEs and padding	2024-02-22 14:30:41 -08:00
Ejaz Ahmed	a465e39bb9	Fixed issue with multiple SDUs placement before MAC CEs	2024-02-22 14:14:56 -08:00
Melissa	3370570ecd	Merge branch 'episys/ea/mac_headers_validation' into 'episys/sl-eurecom2' Added SLSCH MAC sub-header, updated MAC sub-headers based on spec. 38321 See merge request aburger/openairinterface5g!269	2024-02-22 00:22:39 +00:00
Ejaz Ahmed	29b74e7410	Added SLSCH MAC sub-header, updated MAC sub-headers based on spec. 38321	2024-02-22 00:22:39 +00:00
Ejaz Ahmed	3fa03965a1	reverted some changes; added sec label, modified variable name	2024-02-21 11:49:31 -08:00
Ejaz Ahmed	d7b1a78e71	Merge branch 'episys/sl-eurecom2' into episys/ea/mac_headers_validation Following changes are made: 1) Added instructions in rfsim README.md for running rfsimulator with updated sl_preconfiguration.conf location	2024-02-21 11:32:25 -08:00
Ejaz Ahmed	a2e75e10d3	Merge branch 'eurecom/sl-eurecom2' into episys/sl-eurecom2	2024-02-21 11:30:54 -08:00
Ejaz Ahmed	714629c26f	Added SLSCH MAC subheader, updated MAC subheaders based on spec. 38321 Following changes are made: 1) Added SLSCH MAC subheader 2) Validated MAC SDU subheader 3) Added SL_BSR subheader 4) Modified & validated MAC subheaders processing on tx and rx	2024-02-21 11:17:13 -08:00
Ejaz Ahmed	9e686e448d	5G sidelink PSFCH Tx implementation Updates covered in this commit: 1) Computed feedback slot based on PSFCH time gap, PSFCH period and HARQ feedback 2) Generated PSFCH pdu 3) Implemented PSFCH scheduling 4) Allocated PRBs based on slot and subchannel 5) Updated data structures accordingly 6) Modified configuration computation for PSFCH PRB set 7) Changed computation for number of PSFCH symbols 8) Moved sl_preconfiguration.conf under NR-SIDELINK/CONF	2024-02-16 10:50:02 -08:00
Melissa	5a88bb670a	Merge branch 'episys/ea/psfch_configurations' into 'episys/sl-eurecom2' Removed send_psfch_with_pucch command line argument See merge request aburger/openairinterface5g!267	2024-02-16 09:13:22 -08:00
Melissa	b4a314b64e	Updated prconfiguration code & Moved configuration file	2024-02-16 09:13:01 -08:00
Deokseong "David" Kim	6be609a59f	picked `907130d9`	2024-02-16 09:00:36 -08:00
Ejaz Ahmed	69c357655e	Fixed spacing issue	2024-02-15 10:20:55 -08:00
Melissa	45dd2a7fb0	Merge branch 'episys/ea/tx_psfch' into 'episys/sl-eurecom2' PSFCH Tx implementation: PSFCH PDU generation, scheduling and PRBs allocation See merge request aburger/openairinterface5g!268	2024-02-15 16:30:42 +00:00
Ejaz Ahmed	b5dd8de98f	PSFCH Tx implementation: PSFCH PDU generation, scheduling and PRBs allocation	2024-02-15 16:30:42 +00:00
Melissa	a42a4d1a06	Merge branch 'episys/ea/psfch_configurations' into 'episys/sl-eurecom2' Removed send_psfch_with_pucch command line argument See merge request aburger/openairinterface5g!267	2024-01-30 16:50:45 +00:00
Ejaz Ahmed	3c485239ba	Removed resetting of psfch based on pucch based psfch transmission	2024-01-30 16:46:22 +00:00
Ejaz Ahmed	14b972e878	Removed header file	2024-01-30 16:44:25 +00:00
Ejaz Ahmed	aff9391806	Merge branch 'episys/sl-eurecom2' into episys/ea/psfch_configurations	2024-01-30 16:43:41 +00:00
Ejaz Ahmed	c734cfab93	Removed help MACRO for command line psfch argument	2024-01-30 16:30:14 +00:00
Ejaz Ahmed	3dd8395c8f	Removed flag for send_psfch_with_pucch	2024-01-30 16:24:03 +00:00
Ejaz Ahmed	99a750d672	Merge branch 'episys/ea/psfch_configurations' of gitlab.int-episci.com:aburger/openairinterface5g into episys/ea/psfch_configurations	2024-01-30 15:09:46 +00:00
Ejaz Ahmed	82dfb5c4ec	Reverteunnecessary changes	2024-01-30 15:09:13 +00:00
Melissa	7fd180f30b	Merge branch 'episys/ea/psfch_configurations' into 'episys/sl-eurecom2' Added functionality to read PSFCH configurations from conf file See merge request aburger/openairinterface5g!266	2024-01-30 15:09:11 +00:00
Ejaz Ahmed	f52f258eec	Added functionality to read PSFCH configurations from conf file	2024-01-30 15:09:11 +00:00
Melissa Elkadi	fdad2f7d17	Fixing more white space	2024-01-30 13:59:32 +00:00
Melissa Elkadi	1245c05385	Reverting whitespace changes	2024-01-30 13:58:00 +00:00
Melissa Elkadi	e534761719	updating the name of psfch_pucch variable and clean up	2024-01-30 13:54:13 +00:00
Ejaz Ahmed	2976628409	Added PSFCH configurations; Ignored number of psfch symbols a) Added PSFCH configurations in conf file for TX resource pool; b) In case of pucch based psfch transmission, ignored number of psfch symbols for number of pssch symbols calculation	2024-01-30 02:59:55 +00:00
Ejaz Ahmed	34aede6ee5	Moved conf file to conf directory; long bit replace with hex numbers	2024-01-27 17:32:28 +00:00
Ejaz Ahmed	d2bbbb16ad	Temporarily Removed number of PSFCH symbols from number of PSSCH symbhols computation	2024-01-26 21:05:49 +00:00
Ejaz Ahmed	7e83f75d21	Added functionality to take PSFCH Preconfigurations from conf file	2024-01-26 20:36:53 +00:00
Ejaz Ahmed	c4706eda69	Added further logs	2024-01-25 19:56:47 +00:00
Ejaz Ahmed	28f2129d3e	Added harq_feedback condition; Added more logs	2024-01-25 17:14:57 +00:00
Ejaz Ahmed	238a7837cf	Added updated configuration file for psfch	2024-01-24 20:25:40 +00:00
Ejaz Ahmed	e474090459	Added sl_preconfiguration file	2024-01-24 18:44:10 +00:00
Ejaz Ahmed	6f5205ec1c	Commented out Rx to Tx notification mechanism; added configurations	2024-01-24 18:38:38 +00:00
Ejaz Ahmed	f5250c1ec4	Added but commented out due to issue with slsch reception	2024-01-23 21:22:43 +00:00
Ejaz Ahmed	156b806abb	Updated code for psfch tx side	2024-01-15 22:49:53 +00:00
Ejaz Ahmed	d4e030cc3b	Added more parameters in psfch pdu	2024-01-09 02:04:07 +00:00
Ejaz Ahmed	cb17a2530c	Added Pre-configurations, created psfch pdu, scheduled psfch for transmission	2024-01-06 01:37:14 +00:00
Deokseong "David" Kim	907130d999	Merge branch 'episys/ea/fixed_pscch_slot_conflict_psbch' into 'episys/sl-eurecom2' Fixed issue with reception of PSBCH See merge request aburger/openairinterface5g!265	2023-12-21 18:03:08 +00:00
Ejaz Ahmed	d201d89c94	Fixed issue with reception of PSBCH	2023-12-21 18:03:08 +00:00
Raymond Knopp	5cc6d9e5c3	Merge branch 'sl-eurecom2' of https://gitlab.eurecom.fr/oai/openairinterface5g into sl-eurecom2	2023-10-14 07:19:44 +02:00
Raymond Knopp	1a815f7e15	warnings	2023-10-14 07:19:29 +02:00
ue1	05cb48d29c	GPIO changes	2023-10-13 16:00:35 -04:00
Raymond Knopp	911bd2be5d	removed some assertions after bogus reception of PSCCH	2023-10-13 16:34:24 +02:00
ue1	5ea68eb132	Merge branch 'sl-eurecom2' of https://gitlab.eurecom.fr/oai/openairinterface5g into sl-eurecom2	2023-10-13 09:36:05 -04:00
ue1	94188666ce	removed some assertions	2023-10-13 09:35:43 -04:00
Raymond Knopp	a6d86ea8c9	Merge branch 'sl-eurecom2' of https://gitlab.eurecom.fr/oai/openairinterface5g into sl-eurecom2	2023-10-13 09:12:33 -04:00
Raymond Knopp	d3702751ec	removal of logs	2023-10-13 09:12:13 -04:00
ue1	63b3d8a92f	testing	2023-10-13 08:25:31 -04:00
Raymond Knopp	597c897977	improving stat	2023-10-13 06:33:18 -04:00
Raymond Knopp	d1bbbb5dd3	analytics of PSCCH/PSSCH	2023-10-12 11:50:16 +02:00
Raymond Knopp	18853ab6cc	supression of logs	2023-10-12 08:11:06 +02:00
Raymond Knopp	9cc948635c	Merge branch 'sl-eurecom2' of https://gitlab.eurecom.fr/oai/openairinterface5g into sl-eurecom2	2023-10-12 07:41:57 +02:00
Raymond Knopp	93d4a07932	TX path MAC PDU fix	2023-10-12 07:41:35 +02:00
Raymond Knopp	6bfe76b086	MAC pdu fixes, testing RX patch of rlc/pdcp/sdap	2023-10-12 07:40:39 +02:00
Raymond Knopp	e568b2c85a	fix for MAC subheader handling in SL	2023-10-12 00:35:49 +02:00
Raymond Knopp	435b636d89	minor changes	2023-10-11 22:20:12 +02:00
Raymond Knopp	84504a38a0	small fixes for LCID/SLRB ids	2023-10-11 06:28:31 -04:00
ue1	4bd3007565	removal of many debugging logs, added pscch/pssch statistics, TX/RX switching time increase (3->4 slots	2023-10-11 05:25:12 -04:00
Raymond Knopp	dad4240016	merged pdcp/rlc components to current L1/L2	2023-10-09 23:08:11 +02:00
Raymond Knopp	2cda03b016	compilation ok	2023-10-09 22:44:08 +02:00
Raymond Knopp	198c319788	intermediate commit	2023-10-05 21:20:58 +02:00
Raymond Knopp	18d720f377	fixed issue with demux of SCI1/SCI2/SLSCH in SLSCH receiver. Added skeleton for MAC parsing on RX for SL.	2023-10-02 02:58:40 +02:00
Raymond Knopp	ba6a8554a3	minor changes	2023-09-28 21:14:48 +02:00
Raymond Knopp	ffda9c758a	removed logs and added a bit more temporary debugging for SCI2	2023-09-18 15:49:13 +02:00
Raymond Knopp	60a7eb326c	adding color defs for printing	2023-09-18 10:07:37 +02:00
Raymond Knopp	6a5a9f18bf	testing sci2/slsch	2023-09-18 09:34:51 +02:00
Raymond Knopp	4bf5166aed	integration of PSSCH with PUSCH TX	2023-09-07 21:38:38 +02:00
Raymond Knopp	d4e30b972b	PSCCH RX testing 2	2023-08-25 09:19:13 +02:00
Raymond Knopp	858a13119b	sci1a RX testing	2023-08-24 21:56:32 +02:00
Raymond Knopp	5b16b58496	debugging memory leaks	2023-08-22 00:27:26 +02:00
Raymond Knopp	0588003034	testing SCI1A	2023-08-21 21:02:30 +02:00
Raymond Knopp	b8d9da2e81	sci/slsch mac step1	2023-08-19 08:58:44 +02:00
Raymond Knopp	8199a1e093	fixes after merge with NR_SL_PSBCH_2	2023-08-03 23:26:54 +02:00
Raymond Knopp	7efe5880a1	Merge branch 'NR_SL_PSBCH_2' into sl-eurecom2	2023-08-03 15:50:49 +02:00
Raymond Knopp	b9caf3ecc4	Merge branch 'NR_SL_PSBCH_2' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SL_PSBCH_2	2023-08-03 15:50:02 +02:00
Raghavendra Dinavahi	4ca508228f	Enable SCOPE for PSBCH - PSBCH LLR, PSBCH IQ, PSBCH RSRP, CIR added in scope. - use --dqt or --d option to enable scope on the RX UE - -d option does not show RSRP	2023-08-03 14:55:16 +02:00
Raymond Knopp	9ecd473a41	Merge branch 'sl_eurecom_integration' into sl-eurecom2 Conflicts: CMakeLists.txt	2023-08-03 10:21:42 +02:00
Raymond Knopp	f32c759ecf	modifications to allow running SL without --phy-test flag	2023-08-03 10:19:07 +02:00
Raghavendra Dinavahi	88b6cdd209	Changes for Sidelink RFSIM testing - UE1 is a SYNC REFERENCE UE - TX PSBCH started using command - sudo RFSIMULATOR=server ./nr-uesoftmodem --rfsim --phy-test --sl-mode 2 --sync-ref - UE2 syncs onto UE1 - RX PSBCH and continues to receive PSBCH started using command - sudo ./nr-uesoftmodem --rfsim --phy-test --sl-mode 2 - In the default use case 2 Sidelink SSBs sent over 16 frames.	2023-08-02 02:30:21 +02:00
Raghavendra Dinavahi	8bb2f3991b	Sidelink SLSS SEARCH Procedure	2023-08-02 02:28:25 +02:00
Raghavendra Dinavahi	4d369a6993	Sidelink config MAC->PHY, PSBCH scheduler and supporting functions - Phy config update and Sidelink frame parameters initialisation - PSBCH scheduler to trigger TX PSBCH/RX PSBCH actions - Sidelink indication with rx ind to trigger send SL-MIB to MAC	2023-08-02 02:28:25 +02:00
Raghavendra Dinavahi	70f586cb3c	Sidelink configuration passed from RRC->MAC, defined interface functions - Phy configuration will be prepared by MAC - Sidelink preconfiguration parameters passed from RRC->MAC - Only 1 SSB TA allocation used - psbch payload prepared by MAC after receiving the tx slss req	2023-08-02 02:28:25 +02:00
Raghavendra Dinavahi	745cc733ea	PSBCH RX TX changes - RX/TX Phy processing accg to 38.211, 38.212 Rel16 - Rate matching fix from Ralf to address 1782 bits - do not try to group the last bits, process them manually - PSBCH simulator used to validate TX/RX phy processing	2023-08-02 02:28:25 +02:00
Raymond Knopp	ee7aacf2ca	sci development	2023-07-26 21:08:48 +02:00
Raymond Knopp	fef6303cc9	initial commit of SCI encoding	2023-07-22 23:07:11 +02:00