Merge remote-tracking branch 'origin/develop'

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

.clang-format

@@ -60,8 +60,6 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-  - RB_FOREACH
-  - UE_iterator
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'

.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

.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

.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
+                }
+            ]
+        }
+    ]
+}

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")
@@ -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")
@@ -296,15 +279,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 +413,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 +431,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 +443,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 +463,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.7)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
-  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find PMD T2")
+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()
 
 ##########################################################
@@ -820,30 +788,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 +814,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 +846,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 +1029,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
@@ -1137,9 +1108,9 @@ 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)
 
@@ -1162,7 +1133,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)
@@ -1224,10 +1194,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
@@ -1279,6 +1245,7 @@ set(L2_NR_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 +1255,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
@@ -1366,7 +1331,6 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
-  ${NR_GNB_MAC_DIR}/slicing/nr_slicing.c
  )
 
 
@@ -1432,14 +1396,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_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)
 
@@ -1459,10 +1424,15 @@ 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)
 
+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 nr_rlc)
 if(E2_AGENT)
   target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
   target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
 
@@ -1888,6 +1858,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)
@@ -1983,7 +1955,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
@@ -2080,16 +2051,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
@@ -2112,7 +2078,7 @@ 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)
                      
@@ -2210,12 +2176,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}
   )
 
@@ -2266,7 +2232,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)
@@ -2305,12 +2271,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)
@@ -2372,9 +2338,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()

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 ##
 

ci-scripts/Jenkinsfile-GitLab-Container

@@ -31,9 +31,6 @@ def do5Gtest = false
 //
 def gitCommitAuthorEmailAddr
 
-// list of failing stages
-def failingStages = ""
-
 pipeline {
   agent {
     label nodeExecutor
@@ -120,49 +117,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 +168,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 +193,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 +213,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 +233,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 +253,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 +273,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
               }
             }
           }
@@ -341,15 +293,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
-                lteTDDB200Status = finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-FDD-LTEBOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += lteTDDB200Status
               }
             }
           }
@@ -365,15 +314,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
-                lteFDDB200OAIUEStatus = finalizeSlaveJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
+                finalizeSlaveJob('RAN-LTE-FDD-OAIUE-OAICN4G-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200OAIUEStatus
               }
             }
           }
@@ -388,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
-                lteFDDB200Status = finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-LTEBOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += lteFDDB200Status
               }
             }
           }
@@ -411,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
-                nsaTDDB200Status = finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
+                finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += nsaTDDB200Status
               }
             }
           }
@@ -434,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
-                saTDDB200Status = finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
+                finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saTDDB200Status
               }
             }
           }
@@ -457,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
-                phytestLDPCoffloadStatus = finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
+                finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += phytestLDPCoffloadStatus
               }
             }
           }
@@ -480,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
-                lteTDD2x2N3xxStatus = finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += lteTDD2x2N3xxStatus
               }
             }
           }
@@ -503,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
-                saAW2SStatus = finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saAW2SStatus
               }
             }
           }
@@ -526,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
-                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+                finalizeSlaveJob('RAN-Interop-F1')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += f1InteropStatus
               }
             }
           }
@@ -549,15 +474,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
               }
             }
           }
@@ -572,15 +494,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
-                saOAIUEStatus = finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
+                finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saOAIUEStatus
               }
             }
           }
@@ -599,7 +518,6 @@ pipeline {
           script {
             echo "Push to Docker-Hub KO"
             currentBuild.result = 'FAILURE'
-            failingStages += '\n * RAN-DockerHub-Push'
           }
         }
       }
@@ -623,8 +541,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 +589,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 +643,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
   }
 }
 

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 {

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 {

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 {

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 {

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 {

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 {

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/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/2023-06-10/lteue-linux-2023-06-10/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
+  TermScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/2023-06-10/libs/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/2023-06-10/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/2023-06-10/libs/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
@@ -161,78 +161,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 +185,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 +196,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

ci-scripts/cls_cluster.py

@@ -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:

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]
@@ -364,33 +365,27 @@ class Containerize():
 			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:
@@ -426,8 +421,8 @@ class Containerize():
 		cmd.run(f"{self.cli} image prune --force")
 		if forceBaseImageBuild:
 			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
-		for image,pattern,name,option in imageNames:
-			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
+		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.
@@ -439,7 +434,7 @@ 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')
@@ -465,50 +460,43 @@ 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
 		if self.ranAllowMerge and forceBaseImageBuild:
 			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
 
 		# create a zip with all logs
@@ -707,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())
@@ -846,7 +833,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,11 +986,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:
@@ -1049,7 +1038,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:
@@ -1071,16 +1059,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
@@ -1219,7 +1197,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'
@@ -1260,7 +1243,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}'
@@ -1313,7 +1296,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()
@@ -1324,6 +1307,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:

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 SimpleQueue
 import concurrent.futures
 
 #import our libs
@@ -494,7 +494,7 @@ class OaiCiTest():
 			messages = [f.result() for f in futures]
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
-	def Ping_common(self, EPC, ue, RAN, printLock):
+	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 +519,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 +528,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 +551,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 +563,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 +573,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 +587,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))
@@ -1364,10 +1358,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 +1385,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):

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

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')

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
 

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

@@ -19,6 +19,7 @@ gNBs =
 
 
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
     tr_s_preference = "f1";
 
@@ -29,7 +30,136 @@ gNBs =
     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 :
     {
@@ -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";
+    };

ci-scripts/conf_files/gnb-cu.sa.band78.106prb.usrpb200.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";
+    };

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";
-    };

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";
 
@@ -20,6 +20,7 @@ gNBs =
 
 
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
     tr_s_preference = "f1";
 
@@ -30,7 +31,136 @@ gNBs =
     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 :
     {

ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf

@@ -8,7 +8,7 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -20,6 +20,7 @@ gNBs =
 
 
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
     tr_s_preference = "f1";
 
@@ -30,7 +31,136 @@ gNBs =
     local_s_portd   = 2153;
     remote_s_portc  = 500;
     remote_s_portd  = 2153;
+    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 :
     {

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";
 
@@ -57,9 +56,32 @@ gNBs =
   }
 );
 
-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";
+    };
+

ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.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";
 
@@ -57,6 +56,23 @@ gNBs =
   }
 );
 
+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";
 };

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"

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";
-};

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";
 
@@ -218,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";
+    };

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 = (

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;

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";

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";

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];

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";

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";
 
@@ -22,7 +22,7 @@ gNBs =
 
     ////////// Physical parameters:
     pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
     do_SRS                                                    = 0;
 
@@ -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;

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

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";

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";

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

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

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

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)

ci-scripts/epc.py

@@ -679,7 +679,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 +831,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)

ci-scripts/main.py

@@ -750,6 +750,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				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)

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()

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>

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">

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -43,7 +43,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-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">

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -32,8 +32,9 @@
  000022
  000023
  000024
- 000025
  020021
+ 020022
+ 030021
  100021
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -42,7 +43,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="000020">
@@ -71,33 +72,33 @@
 
         <testCase id="000023">
                 <class>DeployGenObject</class>
-                <desc>Deploy 3 OAI 5G DUs RF sim SA</desc>
+                <desc>Deploy OAI 5G DU RF sim SA</desc>
                 <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-du oai-du2 oai-du3</services>
-                <nb_healthy>10</nb_healthy>
+                <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 oai-nr-ue2</services>
-                <nb_healthy>12</nb_healthy>
-        </testCase>
-
-        <testCase id="000025">
-                <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-ue3</services>
-                <nb_healthy>13</nb_healthy>
+                <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>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <id>rfsim5g_ue</id>
+                <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>
 

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">

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">
@@ -80,10 +80,10 @@
                 <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">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -33,15 +33,10 @@
  000002
  000003
  000004
- 000005
- 000006
- 000007
  020001
  020002
  020003
  020004
- 020105
- 444445
  030001
  030002
  444444
@@ -49,7 +44,7 @@
  020005
  444444
  333333
- 020006
+ 020005
  100001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
@@ -58,7 +53,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">
@@ -101,30 +96,6 @@
                 <nb_healthy>9</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>12</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>15</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>17</nb_healthy>
-        </testCase>
-
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
@@ -165,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>
@@ -211,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>

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">

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">

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">

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>

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">

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>

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">

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>

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">

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>

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>

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/2Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 20M -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">

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>
 

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,10 +39,6 @@
     110011
     110001
     150001
-    160001
-    100002
-    160002
-    150001
     110011
     110001
     150000
@@ -89,11 +85,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 +114,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,8 +155,8 @@
 
   <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/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>
@@ -170,8 +166,8 @@
 
   <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)(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>
@@ -181,28 +177,13 @@
 
   <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)(20 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="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>

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>
 
 
@@ -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>
 

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>
 

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>
 

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>
 

ci-scripts/xml_files/t1_offload_test.xml

@@ -0,0 +1,102 @@
+<!--
+ 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-t1-offload</htmlTabRef>
+	<htmlTabName>Test T1 Offload</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>1</repeatCount>
+	<TestCaseRequestedList>000111 000112 000121 000122 000131 000132 000211 000212 000221 000222 000231 000232</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000111">
+		<class>Run_LDPCt1Test</class>
+		<desc>Run nr_ulsim with CPU</desc>
+		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -C10 -P</physim_run_args>
+	</testCase>
+
+	<testCase id="000112">
+		<class>Run_LDPCt1Test</class>
+		<desc>Run nr_ulsim with T1 LDPC offload</desc>
+		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P</physim_run_args>
+	</testCase>
+
+	<testCase id="000121">
+		<class>Run_LDPCt1Test</class>
+		<desc>Run nr_ulsim with CPU</desc>
+		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -C10 -P</physim_run_args>
+	</testCase>
+
+	<testCase id="000122">
+		<class>Run_LDPCt1Test</class>
+		<desc>Run nr_ulsim with T1 LDPC offload</desc>
+		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P</physim_run_args>
+	</testCase>
+
+	<testCase id="000131">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with CPU</desc>
+                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -C10 -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000132">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with T1 LDPC offload</desc>
+                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000211">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with CPU</desc>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -C10 -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000212">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with T1 LDPC offload</desc>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P</physim_run_args>
+	</testCase>
+
+	<testCase id="000221">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with CPU</desc>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -C10 -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000222">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with T1 LDPC offload</desc>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000231">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with CPU</desc>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -C10 -P</physim_run_args>
+        </testCase>
+
+        <testCase id="000232">
+                <class>Run_LDPCt1Test</class>
+                <desc>Run nr_ulsim with T1 LDPC offload</desc>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P</physim_run_args>
+        </testCase>
+
+</testCaseList>

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md

@@ -410,33 +410,16 @@ in HSS config:
             NB_USERS: 10
 ```
 
-All UE parameter values will be taken from the mounted config file, so modify
-the corresponding UE file to reflect the above changes
+in UE config:
 
 ```yaml
-  oai_ue0:
-        [...]
-        volumes:
-            - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-```
-
-and in the UE file, you should have
-```
-PLMN: {
-    PLMN0: {
-           FULLNAME="OpenAirInterface";
-           SHORTNAME="OAICN";
-           MNC="96";
-           MCC="208";
-    };
-};
-[...]
-    SIM: {
-        MSIN="0100000001";
-        USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
-        OPC="c42449363bbad02b66d16bc975d77cc1";
-        MSISDN="001011234561010";
-    };
+            MCC: '208'
+            MNC: '96'
+            SHORT_IMSI: '0100000001'
+            LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'c42449363bbad02b66d16bc975d77cc1'
+            MSISDN: '001011234561010'
+            HPLMN: 20896
 ```
 
 As you can see: `LTE_K` and `LTE_KEY` are the same value. And `OP_KEY` and `OPC` can be deduced from each other. Look in HSS logs.
@@ -488,19 +471,13 @@ in SPGW-C/-U configs:
             REALM: openairinterface.org
 ```
 
-In eNB, all the parameter values will be taken from the mounted config file.
+in eNB config:
 
 ```yaml
-oai_enb0:
-        [...]
-        volumes:
-            - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf
-```
-
-with the eNB config reading:
-
-```libconfig
-    plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } );
+            MCC: '208'
+            MNC: '96'
+            MNC_LENGTH: 2
+            TAC: 1
 ```
 
 The values SHALL match, and `TAC` shall match `TAC_0` from MME.

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-cu
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -187,7 +186,6 @@ services:
         container_name: rfsim5g-oai-du
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
@@ -200,51 +198,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-    oai-du2:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.143
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-du3:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.144
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du
         networks:
@@ -257,44 +216,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-    oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du2
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.151
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du3
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.152
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
 
 networks:
     public_net:

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -186,8 +185,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment: 
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

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

@@ -12,81 +12,18 @@
   </tr>
 </table>
 
-This page is valid for an `Ubuntu18` host.
-It is also valid for `Ubuntu 20.04`.
+This page is only valid for an `Ubuntu18` host.
 
 This tutorial is only valid once this file is merged into the `develop` branch.
-# 1. Adapt the `docker-compose` to your environment #
-The yaml file is in the following directory:  `ci-scripts/yaml_files/5g_l2sim_tdd`
 
-In the `SMF` section, provide your own DNS IP address:
-
-```yaml
-            DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-```
-gNB section:
-
-All the parameter values will be taken from the mounted config file:
-
-```yaml
-oai-gnb:
-        [...]
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf
-```
-
-You need to provide your docker-host primary IP address and interface name: in our case `172.21.16.128` and `eno1`.
-The following refers to the contents of the previously mentioned .conf file
-
-```yaml
-            GNB_NGA_IF_NAME: eno1
-            GNB_NGA_IP_ADDRESS: 172.21.16.128
-            GNB_NGU_IF_NAME: eno1
-            GNB_NGU_IP_ADDRESS: 172.21.16.128
-```
-
-For the UE, all the parameter values will be taken from the mounted config
-file, in the section `oai-nr-ue0`:
-
-```yaml
-  oai-nr-ue0:
-        [...]
-        volumes:
-            - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
-```
-
-In this section, you need to set the proper values for `local_n_if_name` and `remote_n_address`
-where the UE configuration (mounted to `/opt/oai-nr-ue/etc/nr-ue.conf`) reads:
-
-```libconfig
-MACRLCs = (
-        {
-        num_cc = 1;
-        tr_n_preference = "nfapi";
-        local_n_if_name  = "eno1";
-        remote_n_address = "127.0.0.1"; //Proxy IP
-        local_n_address  = "127.0.0.1";
-        ...
-```
-
-This tutorial is a first draft. This nFAPI feature and the proxy are still under development.
-
-At time of writing, we were able to run in `host-mode`, 1 `NR-UE` and just ping traffic.
-
-
-
-
-# 2. Retrieving the images on Docker-Hub #
+# 1. Retrieving the images on Docker-Hub #
 
 Currently the images are hosted under the team account `oaisoftwarealliance`. They were previously hosted under the user account `rdefosseoai`.
 
 Once again you may need to log on [docker-hub](https://hub.docker.com/) if your organization has reached pulling limit as `anonymous`.
 
 ```bash
-docker login
-```
-```bash
+$ docker login
 Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.
 Username:
 Password:
@@ -95,33 +32,33 @@ Password:
 Now pull images.
 
 ```bash
-docker pull mysql:8.0
-docker pull oaisoftwarealliance/oai-amf:v1.5.0
-docker pull oaisoftwarealliance/oai-nrf:v1.5.0
-docker pull oaisoftwarealliance/oai-smf:v1.5.0
-docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
-docker pull oaisoftwarealliance/trf-gen-cn5g:focal
+$ docker pull mysql:8.0
+$ docker pull oaisoftwarealliance/oai-amf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-smf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal
 
-docker pull oaisoftwarealliance/oai-gnb:develop
-docker pull oaisoftwarealliance/oai-nr-ue:develop
-docker pull oaisoftwarealliance/proxy:develop
+$ docker pull oaisoftwarealliance/oai-gnb:develop
+$ docker pull oaisoftwarealliance/oai-nr-ue:develop
+$ docker pull oaisoftwarealliance/proxy:develop
 ```
 
 And **re-tag** them for tutorials' docker-compose file to work.
 
 ```bash
-docker image tag oaisoftwarealliance/proxy:develop oai-lte-multi-ue-proxy:latest
+$ docker image tag oaisoftwarealliance/proxy:develop oai-lte-multi-ue-proxy:latest
 ```
 
 ```bash
-docker logout
+$ docker logout
 ```
 
 Note that the proxy image is based on the source available at [https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy](https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy).
 
 At time of writing, the `latest` tag corresponded to `56cfdc046a5f96d5e67d42a2fc2bf6ba2fe58b41` commit.
 
-# 3. Deploy containers #
+# 2. Deploy containers #
 
 **CAUTION: this SHALL be done in multiple steps.**
 
@@ -135,13 +72,11 @@ The `gNB`, `proxy` and `NR-UE` containers will be deployed in `host`-mode. It wi
 sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up
 ```
 
-## 3.1. Deploy OAI 5G Core Network ##
+## 2.1. Deploy OAI 5G Core Network ##
 
 ```bash
-cd ci-scripts/yaml_files/5g_l2sim_tdd
-docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
-```
-```bash
+$ cd ci-scripts/yaml_files/5g_l2sim_tdd
+$ docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
 Creating network "l2sim-oai-public-net" with driver "bridge"
 Creating network "l2sim-oai-traffic_net-net" with driver "bridge"
 Creating l2sim-oai-nrf ... done
@@ -155,9 +90,7 @@ Creating l2sim-oai-ext-dn ... done
 Wait for a bit.
 
 ```bash
-docker-compose ps -a
-```
-```bash
+$ docker-compose ps -a
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
 l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
@@ -171,9 +104,7 @@ l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 880
 At this point, you can prepare a capture on the newly-created public docker bridges:
 
 ```bash
-ifconfig
-```
-```bash
+$ ifconfig
 ...
 l2sim-public: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         inet 192.168.71.129  netmask 255.255.255.192  broadcast 192.168.71.191
@@ -193,19 +124,16 @@ l2sim-traffic: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         TX packets 3999  bytes 23367972 (23.3 MB)
         TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
 ...
-```
-```bash
-sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135 and not arp and not port 53 and not port 2152 and not port 2153)" -i l2sim-public -i l2sim-traffic -w /tmp/capture_5g_l2sim_tdd.pcap > /tmp/tshark.log 2>&1 &
+
+$ sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135 and not arp and not port 53 and not port 2152 and not port 2153)" -i l2sim-public -i l2sim-traffic -w /tmp/capture_5g_l2sim_tdd.pcap > /tmp/tshark.log 2>&1 &
 ```
 
-## 3.2. Deploy OAI gNB in Standalone Mode as a VNF ##
+## 2.2. Deploy OAI gNB in Standalone Mode as a VNF ##
 
 **CAUTION: To execute this 2nd step, the whole `CN5G` SHALL be in `healthy` state (especially the `mysql` container).**
 
 ```bash
-docker-compose up -d oai-gnb
-```
-```bash
+$ docker-compose up -d oai-gnb
 l2sim-oai-nrf is up-to-date
 l2sim-oai-spgwu is up-to-date
 l2sim-oai-ext-dn is up-to-date
@@ -216,8 +144,6 @@ Wait for a bit.
 
 ```bash
 $ docker-compose ps -a
-```
-```bash
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
 l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
@@ -231,10 +157,8 @@ l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 880
 
 You can verify that the `gNB` is connected with the `AMF`:
 
-```bash
-docker logs l2sim-oai-amf
-```
-```bash
+```bagh
+$ docker logs rfsim5g-oai-amf
 ...
 [AMF] [amf_app] [info ] |----------------------------------------------------gNBs' information-------------------------------------------|
 [AMF] [amf_app] [info ] |    Index    |      Status      |       Global ID       |       gNB Name       |               PLMN             |
@@ -243,12 +167,10 @@ docker logs l2sim-oai-amf
 ...
 ```
 
-## 3.3. Deploy OAI NR-UE and proxy
+## 2.3. Deploy OAI NR-UE and proxy
 
 ```bash
-docker-compose up -d proxy oai-nr-ue
-```
-```bash
+$ docker-compose up -d proxy oai-nr-ue0
 l2sim-mysql is up-to-date
 l2sim-oai-nrf is up-to-date
 l2sim-oai-amf is up-to-date
@@ -263,9 +185,7 @@ Creating l2sim-proxy ... done
 Wait for a bit.
 
 ```bash
-docker-compose ps -a
-```
-```bash
+$ docker-compose ps -a
        Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
 l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
@@ -277,11 +197,8 @@ l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/
 l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
 l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)                               
-```
-```bash
-docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-nrf l2sim-oai-smf l2sim-oai-spgwu l2sim-proxy
-```
-```bash
+
+$ docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-nrf l2sim-oai-smf l2sim-oai-spgwu l2sim-proxy
 CONTAINER          CPU %     MEM USAGE / LIMIT     MEM %
 l2sim-mysql        0.03%     206.7MiB / 62.54GiB   0.32%
 l2sim-oai-amf      4.05%     29.49MiB / 62.54GiB   0.05%
@@ -299,9 +216,7 @@ l2sim-proxy        6.97%     290.4MiB / 62.54GiB   0.45%
 But the CPU speed matters; I am running on a fast server:
 
 ```bash
-lscpu
-```
-```bash
+$ lscpu
 Architecture:        x86_64
 CPU(s):              16
 ...
@@ -324,9 +239,7 @@ We will work on this issue.
 Making sure the OAI UE is connected:
 
 ```bash
-docker exec -it l2sim-oai-nr-ue0 /bin/bash
-```
-```bash
+$ docker exec -it l2sim-oai-nr-ue /bin/bash
 root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
         inet 192.168.71.137  netmask 255.255.255.192  broadcast 192.168.71.191
@@ -353,19 +266,14 @@ oaitun_ue1: flags=4305<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST>  mtu 1500
         TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
 ```
 
-# 4. Check traffic #
+# 3. Check traffic #
 
-## 4.1. Check your Internet connectivity ##
+## 3.1. Check your Internet connectivity ##
 
 You can also check with the `ext-dn` container (IP address is `192.168.72.135` in docker-compose)
 
 ```bash
-docker exec -it l2sim-oai-nr-ue0 /bin/bash
-```
-```bash
-ping -I oaitun_ue1 -c 20 192.168.72.135
-```
-```bash
+$ docker exec -it l2sim-oai-nr-ue /bin/bash
 root@bb4d400a832d# ping -I oaitun_ue1 -c 20 192.168.72.135
 PING 192.168.72.135 (192.168.72.135) from 12.1.1.2 oaitun_ue1: 56(84) bytes of data.
 64 bytes from 192.168.72.135: icmp_seq=1 ttl=63 time=65.1 ms
@@ -379,12 +287,10 @@ PING 192.168.72.135 (192.168.72.135) from 12.1.1.2 oaitun_ue1: 56(84) bytes of d
 rtt min/avg/max/mdev = 16.413/120.639/209.673/57.159 ms
 ```
 
-# 5. Un-deployment #
+# 4. Un-deployment #
 
 ```bash
-docker-compose down
-```
-```bash
+$ docker-compose down
 Stopping l2sim-oai-nr-ue2 ... done
 Stopping l2sim-oai-nr-ue  ... done
 Stopping l2sim-oai-gnb    ... done
@@ -407,3 +313,35 @@ Removing network l2sim-oai-public-net
 Removing network l2sim-oai-traffic-net
 ```
 
+# 5. Adapt the `docker-compose` to your environment #
+
+In the `SMF` section, provide your own DNS IP address:
+
+```yaml
+            DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+```
+
+In the `gNB` section, provide your docker-host primary IP address and interface name: in our case `172.21.16.128` and `eno1`.
+
+```yaml
+            GNB_NGA_IF_NAME: eno1
+            GNB_NGA_IP_ADDRESS: 172.21.16.128
+            GNB_NGU_IF_NAME: eno1
+            GNB_NGU_IP_ADDRESS: 172.21.16.128
+```
+
+Same thing in the `nr-ue` section:
+
+```yaml
+            NR_UE_NFAPI_IF_NAME: eno1
+```
+
+This tutorial is a first draft. This nFAPI feature and the proxy are still under development.
+
+At time of writing, we were able to run in `host-mode`, 1 `NR-UE` and just ping traffic.
+
+Later development will include:
+
+  -  deploying `gNB-VNF`, `proxy` and `UE` in isolated containers (with their own IP address)
+  -  more UEs
+  -  more traffic (`UDP` and `TCP`)

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

@@ -170,7 +170,6 @@ services:
         environment:
             TZ: Europe/Paris
             USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-spgwu
             - oai-amf
@@ -207,7 +206,6 @@ services:
             TZ: Europe/Paris
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
-            ASAN_OPTIONS: detect_leaks=0
         volumes:
             - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results

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

@@ -234,23 +234,24 @@ oaitun_ue1: flags=4305<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST>  mtu 1500
 
 ## 2.4. Deploy Second OAI NR-UE in RF simulator mode and in Standalone Mode ##
 
-Create a entry for new IMSI (208990100001101) in oai_db.sql file.
-For this, refer to section [Making the NR-UE connect to the core
-network](#51-making-the-nr-ue-connect-to-the-core-network)
+```bash
+Create a entry for new IMSI (208990100001101) in oai_db.sql file
+Refer Section - [Making the NR-UE connect to the core network](#51-making-the-nr-ue-connect-to-the-core-network)
 
-Create the entry for the second UE in `docker-compose.yaml` file as follows:
-
-```yaml
+Create entry for Second UE in docker-compose.yaml file as follows:
     oai-nr-ue2:
         image: oai-nr-ue:develop
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
         environment:
+            FULL_IMSI: '208990100001101'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         networks:
             public_net:
                 ipv4_address: 192.168.71.151
@@ -495,31 +496,13 @@ INSERT INTO `users` VALUES ('208990100001101','1','55000000000000',NULL,'PURGED'
 
 As you can see, 2 other values shall match in the NR-UE section of `docker-compose.yaml`:
 
-All the values such as IMSI and KEY are taken from the configuration file mounted into the container. For the first UE, provision as usual through the config file
+OAI UE - 1
+* `FULL_IMSI: '208990100001100'`
+* `FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'`
 
-```yaml
- oai-nr-ue:
-        [...]
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-```
-
-with the config having:
-```libconfig
-uicc0 = {
-  imsi = "208990100001100";
-  key = "fec86ba6eb707ed08905757b1bb44b8f";
-  opc= "C42449363BBAD02B66D16BC975D77CC1";
-  dnn= "oai";
-  nssai_sst=1;
-}
-```
-
-The second UE's IMSI might be changed by either having the second UEs
-docker-compose entry mount another config, or add `--uicc0.imsi
-208990100001101` in `USE_ADDITIONAL_OPTIONS` entry. Note that the latter is a
-feature of the configuration module to overwrite any configuration option in
-the config file on the command line.
+OAI UE - 2
+* `FULL_IMSI: '208990100001101'`
+* `FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'`
 
 We are also using a dedicated `oai-smf.conf` for the `SMF` container: the `oai` DNN shall match the one in  the NR-UE section of `docker-compose.yaml` (`DNN: oai`).
 

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -185,9 +184,8 @@ services:
         image: oaisoftwarealliance/oai-nr-ue:develop
         privileged: true
         container_name: rfsim5g-oai-nr-ue
-        environment:
+        environment: 
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -200,13 +198,13 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
     oai-nr-ue2:
         image: oaisoftwarealliance/oai-nr-ue:develop
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
-        environment:
+        environment: 
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -219,158 +217,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-    oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue3
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.152
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue4:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue4
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.153
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue5:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue5
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.154
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue6:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue6
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.155
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue7:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue7
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.156
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue8:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue8
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.157
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue9:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue9
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.158
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue10:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue10
-        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.159
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
 
 networks:
     public_net:

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -187,7 +186,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -188,7 +187,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

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

@@ -170,7 +170,6 @@ services:
         container_name: rfsim5g-oai-cucp
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -191,8 +190,8 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cuup
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim
+            #--log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-cucp
         networks:
@@ -214,7 +213,6 @@ services:
         container_name: rfsim5g-oai-du
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         networks:
             ran_net:
                 ipv4_address: 192.168.72.142
@@ -232,7 +230,6 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.72.142 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du
         networks:

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

@@ -6,7 +6,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,8 +23,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --rrc_config_path etc/rrc/ --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

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

@@ -6,7 +6,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,8 +23,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

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

@@ -6,7 +6,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,8 +23,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

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

@@ -168,7 +168,6 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -187,8 +186,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

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

@@ -7,7 +7,7 @@ services:
         container_name: oai-gnb
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:

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

@@ -8,7 +8,7 @@ services:
         #entrypoint: /bin/bash -c "sleep infinity"
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.20.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.20.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
         volumes:
             - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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

@@ -43,7 +43,7 @@ services:
         container_name: sa-du-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
         volumes:
             - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev

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

@@ -6,9 +6,9 @@ services:
         privileged: true
         container_name: sa-cu-gnb
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
-            - ../../conf_files/gnb-cu.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
         networks:
             public_net:
                 ipv4_address: 192.168.68.194
@@ -20,15 +20,15 @@ services:
             timeout: 5s
             retries: 5
 
-    gnb_du_fdd:
+    gnb_du_tdd:
         image: oai-gnb:latest
         privileged: true
         container_name: sa-du-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --MACRLCs.[0].ul_max_mcs 28 --L1s.[0].max_ldpc_iterations 20
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
         volumes:
-            - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
         networks:
             public_net:

cmake_targets/autotests/test_case_list.xml

@@ -110,11 +110,11 @@
     </testCase>
 
      <testCase id="nr_pbchsim.106rb">
-      <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 106 PRB, NID 2),
+      <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 106 PRB),
                                    (Test2: PBCH and synchronization, 106PBR),
                                    (Test3: PBCH and synchronization, 106PBR, SSB SC OFFSET 6)</desc>
       <main_exec>nr_pbchsim</main_exec>
-      <main_exec_args>-s-11 -S-8 -n10 -R106 -N2
+      <main_exec_args>-s-11 -S-8 -n10 -R106
                       -s-11 -S-8 -n10 -o8000 -I -R106
                       -s-11 -S-8 -n10 -R106 -O6</main_exec_args>
       <tags>test1 test2 test3</tags>
@@ -200,8 +200,8 @@
                       -n100 -e16 -s11 -S13
                       -n100 -q1 -e26 -s30
                       -n100 -e0 -t95 -S-1.0 -i 2 1 0
-                      -n10 -s20 -U 3 0 0 2 -gA -x1 -y4 -z4
-                      -n10 -s20 -U 3 0 0 2 -gA -x2 -y4 -z4
+                      -n10 -s20 -U 3 0 0 2 -gR -x1 -y4 -z4
+                      -n10 -s20 -U 3 0 0 2 -gR -x2 -y4 -z4
                       -n10 -s20 -U 3 0 0 2 -x4 -y4 -z4</main_exec_args>
       <tags>test1 test2 test3 test4 test5 test6 test7</tags>
       <search_expr_true>PDSCH test OK</search_expr_true>

cmake_targets/build_oai

@@ -38,6 +38,7 @@ gen_nvram_path=$OPENAIR_DIR/cmake_targets/ran_build/build
 conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
 HW=""
+VERBOSE_CI=0
 VERBOSE_COMPILE=0
 RUN_GROUP=0
 TEST_CASE_GROUP=""
@@ -46,7 +47,7 @@ BUILD_DOXYGEN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t2 websrv oai_iqplayer"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv oai_iqplayer"
 TARGET_LIST=""
 
 function print_help() {
@@ -109,6 +110,8 @@ Options:
    Adds a debgging facility to the binary files: GUI with major internal synchronization events
 -x | --xforms
    Will compile with software oscilloscope features
+--verbose-ci
+   Compile with verbose instructions in CI Docker env
 --verbose-compile
    Shows detailed compilation instructions in makefile
 --build-doxygen
@@ -158,8 +161,6 @@ Options:
   Enable the memory sanitizer on all targets. Requires clang, and is
   incompatible with ASan/UBSan. To build, issue:
   CC=/usr/bin/clang CXX=/usr/bin/clang++ ./build_oai ... --sanitize-memory
---sanitize-thread | -fsanitize=thread
-  Enable the thread sanitizer on all targets
 -h | --help
    Print this help"
 }
@@ -335,16 +336,19 @@ function main() {
        -x | --xforms)
             echo_info "Will generate the software oscilloscope features"
             shift;;
+       --verbose-ci)
+            VERBOSE_CI=1
+            echo_info "Will compile with verbose instructions in CI Docker env"
+            shift;;
        --verbose-compile)
             VERBOSE_COMPILE=1
             echo_info "Will compile with verbose instructions"
             shift;;
        --build-doxygen)
-           CMAKE_CMD="$CMAKE_CMD -DGENERATE_DOXYGEN=ON"
-	   TARGET_LIST="$TARGET_LIST doc"
-           BUILD_DOXYGEN=1
-           echo_info "Will build doxygen support"
-           shift;;     
+            CMAKE_CMD="$CMAKE_CMD -DGENERATE_DOXYGEN=ON"
+            BUILD_DOXYGEN=1
+            echo_info "Will build doxygen support"
+            shift;;     
        --disable-T-Tracer)
             CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
             echo_info "Disabling the T tracer"
@@ -418,9 +422,6 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD -DTRACE_ASN1C_ENC_DEC=ON"
             echo_info "Enabling asn1c internal traces via OAI logging system"
             shift 1;;
-        --sanitize-thread | -fthread=address)
-            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
-            shift;;
         -h | --help)
             print_help
             exit 1;;
@@ -496,12 +497,6 @@ function main() {
     echo_info "Running \"$CMAKE_CMD\""
     eval $CMAKE_CMD
     compilations $BUILD_DIR all.txt $TARGET_LIST
-    ###################
-    # Doxygen Support #
-    ###################
-    if [ "$BUILD_DOXYGEN" = "1" ] ; then
-	echo_info "Built Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/$BUILD_DIR/build/html/index.html"
-    fi
 
     if [ "$UE" = 1 ] ; then
 
@@ -525,6 +520,18 @@ function main() {
     fi
   fi
 
+  ###################
+  # Doxygen Support #
+  ###################
+  if [ "$BUILD_DOXYGEN" = "1" ] ; then
+    doxygen_log=$OPENAIR_DIR/cmake_targets/log/doxygen.log
+    echo_info "Building Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/targets/DOCS/html/index.html"
+    echo_info "Doxygen generation log is located here: $doxygen_log"
+    echo_info "Generating Doxygen files....please wait"
+    (
+      cmake --build . --target doc
+    ) >& $doxygen_log
+  fi
 
   ##############
   # Auto-tests #

cmake_targets/cross-arm.cmake

@@ -1,16 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(CMAKE_C_COMPILER   /usr/bin/aarch64-linux-gnu-gcc-9)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-9)
-
-set(CROSS_COMPILE 1)
-set(bnProc_gen_128_DIR    ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(bnProc_gen_avx2_DIR   ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(bnProc_gen_avx512_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(cnProc_gen_128_DIR    ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(cnProc_gen_avx2_DIR   ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(cnProc_gen_avx512_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(genids_DIR            ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-set(_check_vcd_DIR        ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)
-

cmake_targets/tools/build_helper

@@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
 OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
 case "$OS_DISTRO" in
   fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
-  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;;
+  rhel)   OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   rocky)  OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
   debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
@@ -54,17 +54,16 @@ fi
 ###############################
 ## echo and  family
 ###############################
-# only emit color if connected to a terminal, and if it supports colors
-if [ -t 1 ]; then
-  num_colors=$(tput colors)
-  if [ -n "$num_colors" ] && [ "$num_colors" -ge 8 ]; then
-    red='\E[31m'
-    green='\E[32m'
-    yellow='\E[33m'
-    blue='\E[1;34m'
-    reset_color='\E[00m'
-  fi
-fi
+black='\E[30m'
+red='\E[31m'
+green='\E[32m'
+yellow='\E[33m'
+blue='\E[1;34m'
+magenta='\E[35m'
+cyan='\E[36m'
+white='\E[37m'
+reset_color='\E[00m'
+COLORIZE=1
 
 cecho()  {
     # Color-echo
@@ -73,7 +72,8 @@ cecho()  {
     local default_msg="No Message."
     message=${1:-$default_msg}
     color=${2:-$green}
-    echo -e "$color$message$reset_color"
+    [ "$COLORIZE" = "1" ] && message="$color$message$reset_color"
+    echo -e "$message"
     return
 }
 
@@ -226,15 +226,18 @@ compilations() {
   local verbose=$([ "$VERBOSE_COMPILE" == "1" ] && echo "-v" || echo "")
   echo cd $OPENAIR_DIR/cmake_targets/$dir/build
   cd $OPENAIR_DIR/cmake_targets/$dir/build
-  echo_info "Running \"$CMAKE --build . $verbose --target $targets -- -j$(nproc)\"" $green
+  echo_info "Running \"cmake --build . $verbose --target $targets -- -j$(nproc)\"" $green
   echo "Log file for compilation is being written to: $dlog/$logfile"
   set +e
   {
-    $CMAKE --build . $verbose --target $targets -- -j$(nproc)
+    cmake --build . $verbose --target $targets -- -j$(nproc)
     ret=$?
   } > $dlog/$logfile 2>&1
-  # Print the errors and warnings for CI purposes
-  egrep -A3 "warning:|error:" $dlog/$logfile || true
+  if [ "$VERBOSE_CI" == "1" ]; then
+     echo "====== Start of log for $logfile ======"
+     cat $dlog/$logfile
+     echo "====== End of log for $logfile ======"
+  fi
   check_warnings "$dlog/$logfile"
   if [[ $ret -eq 0 ]]; then
      echo_success "$targets compiled"
@@ -321,7 +324,8 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get remove libuhd3.15.0 -y || true
         local distribution=$(get_distribution_release)
         if [[ "$distribution" == "ubuntu18.04" || "$distribution" == "ubuntu20.04" || "$distribution" == "ubuntu22.04" ]]; then
-            $SUDO apt-get remove libuhd4.?.? -y || true
+            $SUDO apt-get remove libuhd4.0.0 -y || true
+            $SUDO apt-get remove libuhd4.1.0 -y || true
         fi
         v=$(lsb_release -cs)
         $SUDO apt-add-repository --remove "deb http://files.ettus.com/binaries/uhd/repo/uhd/ubuntu/$v $v main"
@@ -351,7 +355,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get -y install python-tk  $boost_libs_ubuntu libusb-1.0-0-dev
         case "$(get_distribution_release)" in
           "ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
-            $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host
+            $SUDO apt-get -y install libuhd-dev libuhd4.4.0 uhd-host
             ;;
         esac
     elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
@@ -667,8 +671,6 @@ install_asn1c_from_source(){
     git clone https://github.com/mouse07410/asn1c /tmp/asn1c
     cd /tmp/asn1c
     git checkout vlm_master
-    # Showing which version is used
-    git log -n1
     autoreconf -iv
     ./configure --prefix /opt/asn1c/
     make -j`nproc`
@@ -687,15 +689,6 @@ install_simde_from_source(){
     $SUDO rm -rf /tmp/simde
     git clone https://github.com/simd-everywhere/simde-no-tests.git /tmp/simde
     cd /tmp/simde
-    # we can specify a given version of SIMDE (sha-one or tag)
-    if [[ -v SIMDE_VERSION ]]; then
-      git checkout -f $SIMDE_VERSION
-    else
-      # At time of writing, last working commit for OAI
-      git checkout 389f360a66d4a3bec62b7d71ad8be877487809ba
-    fi
-    # Showing which version is used
-    git log -n1
     # brute force copy into /usr/include
     $SUDO \cp -rv ../simde /usr/include
 }

common/config/DOC/config/devusage.md

@@ -1,7 +1,7 @@
 The configuration module objectives are
 1. Allow easy parameters management in oai, helping the development of a flexible, modularized and fully configurable softmodem.
-2. Use a common configuration API in all oai modules
-3. Allow development of alternative configuration sources without modifying the oai code. Today the only delivered configuration source is the libconfig format configuration file.
+1. Use a common configuration API in all oai modules
+1. Allow development of alternative configuration sources without modifying the oai code. Today the only delivered configuration source is the libconfig format configuration file.
 
 As a developer you may need to look at these sections:
 

common/config/DOC/config/devusage/addaparam.md

@@ -11,7 +11,7 @@ paramdef_t someoptions[] = {
    {"opt1",  "<help opt1>",   0,      uptr:&varopt1, defuintval:0, TYPE_UINT,  0 },
 };
 
-config_get( someoptions,sizeofArray(someoptions),"somesection");
+config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection");
 
 ```
 new code:
@@ -31,7 +31,7 @@ paramdef_t someoptions[] = {
    {"opt2",  "<help opt2>",   0,      strptr:&varopt2,defstrval:"",TYPE_STRING,0   },
 };
 
-config_get( someoptions,sizeofArray(someoptions),"somesection");
+config_get( someoptions,sizeof(someoptions)/sizeof(paramdef_t),"somesection");
 
 ```