Merge branch 'episys/sl-eurecom2' into ea/sl_eurecom2

Updates in this MR are as follows:

1) Enabled support for MCS 1-16; Fixed SNR estimation
2) Added multiple SLSCH feedback support in PSFCH
3) Implemented HARQ process for first transmission and reception
4) Implemented sync notification from nearby to syncref
5) Fixed PSFCH issue in sci_payload in case of psfch_period zero
6) Fixed order of SL UE phy params initializations
7) Moved gNB specific list functions to common file
8) Developed thread lock functions for NR_UE_SL_SCHED
9) Included header files for common moved functions in gNB code
10) Fixed l value in computing alpha for pucch0
11) Fixed warnings
12) cleaned code

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

CHANGELOG.md

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

CMakeLists.txt

@@ -102,23 +102,21 @@ add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of bui
 # in case /proc/cpuinfo exists we want to inspect available Intrinsics
 # -so not to go always through SIMDE emulation
 # -so to avoid AVX512 instructions generation by gcc   
-if(EXISTS "/proc/cpuinfo" AND NOT CROSS_COMPILE)
+execute_process(COMMAND uname -m OUTPUT_VARIABLE CPUARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "CPUARCH ${CPUARCH}")
+if(EXISTS "/proc/cpuinfo")
   file(STRINGS "/proc/cpuinfo" CPUFLAGS REGEX flags LIMIT_COUNT 1)
 else()
   message(WARNING "did not find /proc/cpuinfo -- not setting any x86-specific compilation variables")
 endif()
- 
+
 eval_boolean(AUTODETECT_AVX512 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx512")
 add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is available on the host processor" ON)
 
 eval_boolean(AUTODETECT_AVX2 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx2")
 add_boolean_option(AVX2 ${AUTODETECT_AVX2} "Whether AVX2 intrinsics is available on the host processor" ON)
 
-message(STATUS "CPU architecture is ${CMAKE_SYSTEM_PROCESSOR}")
-if (CROSS_COMPILE)
-  message(STATUS "setting as aarch64")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
-elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(${CPUARCH} STREQUAL "x86_64" AND DEFINED CPUFLAGS)
   # The following intrinsics are assumed to be available on any x86 system
   # (avx, f16c, fma, gnfi, mmx, pclmul, sse, sse2, sse3, xop)
   set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
@@ -141,19 +139,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   if(CPUINFO MATCHES "ssse3")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
   endif()
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mfloat-abi=hard -mfpu=neon -lgcc -lrt")
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
-else()
-  message(FATAL_ERROR "compile for CPU architecture ${CPUARCH}, CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
+elseif(${CPUARCH} NOT STREQUAL "x86_64")
+  message(FATAL_ERROR "Cannot compile for CPU architecture ${CPUARCH}")
 endif()
 
-if (NOT CROSS_COMPILE)
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
-else ()
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8-a")
-endif()
+set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
 
 # add autotools definitions that were maybe used!
 add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")
@@ -173,8 +163,8 @@ set(CMAKE_CXX_FLAGS
 
 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
 if (SANITIZE_ADDRESS)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-check -fno-omit-frame-pointer -fno-common")
   # There seems to be some incompatibility with pthread_create and the RT scheduler, which
   # results in pthread_create hanging.
   #
@@ -266,11 +256,8 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 
 # Debug related options
 #########################################
-add_boolean_option(DEBUG_ASN1 False "Enable ASN1 debug logs" OFF)
-# asn1c skeletons have hardcoded this flag to make customized debug logs
-# OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
-# see common/utils/config.h
-add_boolean_option(TRACE_ASN1C_ENC_DEC OFF "Enable ASN1 encoder/decoder debug traces via OAI logging system" ON)
+add_boolean_option(DEBUG_ASN1      False "ASN1 coder/decoder Debug" OFF)
+#add_boolean_option(DEBUG_MAC_INTERFACE False "print MAC-RLC PDU exchange to stdout") # if true, make sure that global and PDCP log levels are trace, not found in code, commented out, to be removed
 add_boolean_option(T_TRACER            True  "Activate the T tracer, a debugging/monitoring framework" ON)
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs" ON)
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
@@ -280,6 +267,12 @@ set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
+# asn1c skeletons have hardcoded this flag to make customized debug logs
+# OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
+if (DEBUG_ASN1C)
+  add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 # asn1c skeletons need this
 add_definitions(-DHAVE_NETINET_IN_H)
 
@@ -289,15 +282,6 @@ add_definitions(-DHAVE_NETINET_IN_H)
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")
 
-set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
-set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
-message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")
-
-set(KPM_VERSION "KPM_V2" CACHE STRING "The KPM SM version to use")
-set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2" "KPM_V3")
-message(STATUS "Selected KPM Version: ${KPM_VERSION}")
-
-
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -432,7 +416,6 @@ target_link_libraries(x2ap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 set(F1AP_DIR ${OPENAIR2_DIR}/F1AP)
 add_library(f1ap
             ${F1AP_DIR}/f1ap_common.c
-            ${F1AP_DIR}/f1ap_ids.c
             ${F1AP_DIR}/f1ap_cu_interface_management.c
             ${F1AP_DIR}/f1ap_cu_paging.c
             ${F1AP_DIR}/f1ap_cu_rrc_message_transfer.c
@@ -451,7 +434,7 @@ add_library(f1ap
             ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc)
 
 # LPP
 ##############
@@ -643,7 +626,7 @@ add_library(UTIL
   ${OPENAIR_DIR}/common/utils/time_meas.c
   ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread)
+target_link_libraries(UTIL PUBLIC ${T_LIB})
 
 set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -706,6 +689,7 @@ target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_NR_UE
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
   ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
@@ -875,7 +859,7 @@ 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
@@ -1049,7 +1033,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
-  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_freq_equalization.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
@@ -1078,8 +1061,20 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync_sl.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psfch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pscch_tx.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_pucch_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1099,11 +1094,14 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
  # ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
@@ -1129,17 +1127,17 @@ if (${SMBV})
 endif  (${SMBV})
 
 set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
 
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
 add_dependencies(PHY_COMMON dfts)
 target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
 
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
-pkg_check_modules(blas REQUIRED blas)
-pkg_check_modules(lapacke REQUIRED lapacke)
+#pkg_check_modules(blas REQUIRED blas)
+#pkg_check_modules(lapacke REQUIRED lapacke)
 
 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1154,7 +1152,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)
@@ -1206,6 +1203,18 @@ set(RLC_V2
   ${OPENAIR2_DIR}/LAYER2/rlc_v2/rlc_sdu.c
   )
 
+set(NR_RLC_SRC
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/asn1_utils.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_am.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_tm.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_entity_um.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_oai_api.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_pdu.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_sdu.c
+  ${OPENAIR2_DIR}/LAYER2/nr_rlc/nr_rlc_ue_manager.c
+  )
+
 set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
@@ -1263,6 +1272,7 @@ set(L2_LTE_SRC
   )
 
 set(L2_NR_SRC
+  ${NR_RLC_SRC}
   ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_RRC_DIR}/rrc_gNB.c
@@ -1300,6 +1310,7 @@ set(L2_RRC_SRC_UE
   )
 
 set(NR_L2_SRC_UE
+  ${NR_RLC_SRC}
   ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
@@ -1357,7 +1368,7 @@ set (MAC_NR_SRC
 
 
 set (MAC_SRC_UE
-  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
+	#  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${MAC_DIR}/main_ue.c
   ${MAC_DIR}/ue_procedures.c
@@ -1371,13 +1382,17 @@ set (MAC_NR_SRC_UE
   ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
   ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
   ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue_sl.c
   ${NR_UE_MAC_DIR}/mac_vars.c
   ${NR_UE_MAC_DIR}/main_ue_nr.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
   ${NR_UE_MAC_DIR}/nr_ra_procedures.c
   ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_sci_slsch.c
+  ${NR_UE_MAC_DIR}/nr_slsch_scheduler.c
 )
 
 set (ENB_APP_SRC
@@ -1418,14 +1433,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)
 
@@ -1451,13 +1467,13 @@ add_library(e1_pdcp_if
 
 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)
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap)
 if(E2_AGENT)
   target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
   target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
 
+
 add_library(L2_LTE_NR
   ${L2_RRC_SRC}
   ${MAC_SRC}
@@ -1486,7 +1502,7 @@ endif()
 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)
 
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
-target_link_libraries(NR_L2_UE PRIVATE f1ap nr_rlc)
+target_link_libraries(NR_L2_UE PRIVATE f1ap)
 target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_library(MAC_NR_COMMON
@@ -1977,7 +1993,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
@@ -2074,11 +2089,6 @@ 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)
 
@@ -2235,6 +2245,24 @@ target_link_libraries(nr_pbchsim PRIVATE
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
+add_executable(nr_psbchsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
+  ${T_SOURCE}
+  ${SHLIB_LOADER_SOURCES}
+  )
+target_link_libraries(nr_psbchsim PRIVATE
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl shlib_loader
+  )
+target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
@@ -2260,7 +2288,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)
@@ -2304,7 +2332,7 @@ if (ENABLE_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)
@@ -2366,7 +2394,7 @@ 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 dfts)
     if (TARGET ${i})
@@ -2460,16 +2488,6 @@ make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})
 
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
 
-set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
-set_property(CACHE ENABLE_TESTS PROPERTY TYPE BOOL)
-if(ENABLE_TESTS)
-  # activates globally adding tests such that they can be run using ctest
-  enable_testing()
-  # meta-target: each test is supposed to add_dependencies(tests ${NEWTEST})
-  # then, it is possible to build and execute all tests using "ninja tests && ctest"
-  add_custom_target(tests)
-endif()
-
 add_subdirectory(common)
 add_subdirectory(doc)
 add_subdirectory(openair1)

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

README.md

@@ -12,10 +12,6 @@
     <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>
 
-<p align="center">
-    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/releases"><img alt="GitLab Release (custom instance)" src="https://img.shields.io/gitlab/v/release/oai/openairinterface5g?gitlab_url=https%3A%2F%2Fgitlab.eurecom.fr&include_prereleases&sort=semver"></a>
-</p>
-
 <p align="center">
     <a href="https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Container-Parent%2F&label=build%20Images"></a>
 </p>

ci-scripts/Jenkinsfile-GitLab-Container

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

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/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
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
   CmdPrefix: ip netns exec ue1
   MTU: 1500
 amarisoft_ue_2:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
   NetworkScript: ip netns exec ue2 ip a show dev pdn0
   CmdPrefix: ip netns exec ue2
   MTU: 1500
 amarisoft_ue_3:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
   NetworkScript: ip netns exec ue3 ip a show dev pdn0
   CmdPrefix: ip netns exec ue3
   MTU: 1500
 amarisoft_ue_4:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
   NetworkScript: ip netns exec ue4 ip a show dev pdn0
   CmdPrefix: ip netns exec ue4
   MTU: 1500
 amarisoft_ue_5:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
   NetworkScript: ip netns exec ue5 ip a show dev pdn0
   CmdPrefix: ip netns exec ue5
   MTU: 1500
 amarisoft_ue_6:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
   NetworkScript: ip netns exec ue6 ip a show dev pdn0
   CmdPrefix: ip netns exec ue6
   MTU: 1500
 amarisoft_ue_7:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
   NetworkScript: ip netns exec ue7 ip a show dev pdn0
   CmdPrefix: ip netns exec ue7
   MTU: 1500
 amarisoft_ue_8:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
   NetworkScript: ip netns exec ue8 ip a show dev pdn0
   CmdPrefix: ip netns exec ue8
   MTU: 1500
 amarisoft_ue_9:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
   NetworkScript: ip netns exec ue9 ip a show dev pdn0
   CmdPrefix: ip netns exec ue9
   MTU: 1500
 amarisoft_ue_10:
   Host: amariue
-  AttachScript: /root/2023-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}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
@@ -130,13 +130,6 @@ oai_ue_caracal:
   IF: oaitun_ue1
   MTU: 1500
 
-lte_oai_ue_carabe:
-  Host: carabe
-  NetworkScript: docker exec lte-b200-ue-fdd-10Mhz-tm1 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec lte-b200-ue-fdd-10Mhz-tm1
-  IF: oaitun_ue1
-  MTU: 1500
-
 rfsim5g_gnb_nos1:
   Host: localhost
   NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
@@ -185,12 +178,9 @@ rfsim4g_enb_nos1:
 
 l2sim5g_ue:
   Host: localhost
-  AttachScript: docker start l2sim-oai-nr-ue0
-  DetachScript: docker stop l2sim-oai-nr-ue0
   NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
   CmdPrefix: docker exec l2sim-oai-nr-ue0
   IF: oaitun_ue1
-  MTU: 1500
 
 l2sim5g_ext_dn:
   Host: localhost
@@ -199,12 +189,9 @@ l2sim5g_ext_dn:
 
 l2sim4g_ue:
   Host: localhost
-  AttachScript: docker start l2sim4g-oai-lte-ue1
-  DetachScript: docker stop l2sim4g-oai-lte-ue1
   NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
   CmdPrefix: docker exec l2sim4g-oai-lte-ue1
   IF: oaitun_ue1
-  MTU: 1500
 
 l2sim4g_ext_dn:
   Host: localhost

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

@@ -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
@@ -368,23 +370,22 @@ class Containerize():
 		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
 		if result is not None:
 			imageNames.append(('oai-enb', 'eNB'))
-		result = re.search('gNB', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB'))
-		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'))
-		result = re.search('build_cross_arm64', self.imageKind)
-		if result is not None:
-			self.dockerfileprefix = '.ubuntu20.cross-arm64'
+		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:
@@ -433,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')
@@ -466,20 +467,17 @@ class Containerize():
 			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			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 {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', timeout=1200)
-			if image == 'ran-build' and ret.returncode == 0:
-				cmd.run(f"docker run --name test-log -d {image}:{imageTag} /bin/true")
-				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{image}/")
-				cmd.run(f"docker rm -f test-log")
-			else:
-				cmd.run(f"mkdir -p cmake_targets/log/{image}")
+			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\' {image}:{imageTag}")
 			if ret.returncode != 0:
 				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")
+				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
 				allImagesSize[image] = 'N/A -- Build Failed'
 				break
 			else:
@@ -744,7 +742,6 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
 		myCmd = cls_cmd.getConnection(lIpAddr)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
@@ -906,7 +903,7 @@ class Containerize():
 			cnt = 0
 			while (cnt < 20):
 				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
+				result = re.search('got sync|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -988,11 +985,14 @@ class Containerize():
 		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
 			filename = f'{svcName}-{HTML.testCase_id}.log'
+			#mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} | head -n -1 &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 30)
 			mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 120)
 
-		mySSH.command('docker-compose -f ci-docker-compose.yml down -v', '\$', 5)
-		mySSH.close()
+		mySSH.command('docker-compose -f ci-docker-compose.yml down', '\$', 5)
+		# Cleaning any created tmp volume
+		mySSH.command('docker volume prune --force', '\$', 20)
 
+		mySSH.close()
 		# Analyzing log file!
 		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
 		if len(services) > 1:
@@ -1005,7 +1005,7 @@ class Containerize():
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
-		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
+		elif 'oai-nr-ue' in services:
 			self.exitStatus == 0
 			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
@@ -1295,7 +1295,7 @@ class Containerize():
 
 		logging.debug('\u001B[1m Undeploying \u001B[0m')
 		logging.debug(f'Working dir is back {self.yamlPath[0]}')
-		cmd = 'docker-compose -f docker-compose-ci.yml down -v'
+		cmd = 'docker-compose -f docker-compose-ci.yml down'
 		deployStatus = myCmd.run(cmd, timeout=100)
 		if deployStatus.returncode != 0:
 			myCmd.close()
@@ -1306,6 +1306,9 @@ class Containerize():
 			return
 
 		self.deployedContainers = []
+		# Cleaning any created tmp volume
+		cmd = 'docker volume prune --force'
+		deployStatus = myCmd.run(cmd, timeout=100, reportNonZero=False)
 		myCmd.close()
 
 		if fullStatus:

ci-scripts/cls_oai_html.py

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

ci-scripts/cls_oaicitest.py

@@ -43,7 +43,7 @@ import logging
 import datetime
 import signal
 import statistics as stat
-from multiprocessing import SimpleQueue
+from multiprocessing import Process, Lock, SimpleQueue
 import concurrent.futures
 
 #import our libs
@@ -494,6 +494,15 @@ class OaiCiTest():
 			messages = [f.result() for f in futures]
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 
+	def ping_iperf_wrong_exit(self, lock, UE_IPAddress, device_id, statusQueue, message):
+		logging.error(f"ue {device_id} {UE_IPAddress}: {message}")
+		lock.acquire()
+		statusQueue.put(-1)
+		statusQueue.put(device_id)
+		statusQueue.put(UE_IPAddress)
+		statusQueue.put(message)
+		lock.release()
+
 	def Ping_common(self, EPC, ue, RAN):
 		# Launch ping on the EPC side (true for ltebox and old open-air-cn)
 		ping_status = 0
@@ -519,7 +528,6 @@ class OaiCiTest():
 		ping_cmd = f'{ue.getCmdPrefix()} ping {interface} {self.ping_args} 2>&1 | tee /tmp/{ping_log_file}'
 		cmd = cls_cmd.getConnection(ue.getHost())
 		response = cmd.run(ping_cmd, timeout=int(ping_time[0])*1.5)
-		ue_header = f'UE {ue.getName()} ({ueIP})'
 		if response.returncode != 0:
 			message = ue_header + ': ping crashed: TIMEOUT?'
 			logging.error('\u001B[1;37;41m ' + message + ' \u001B[0m')
@@ -529,6 +537,7 @@ class OaiCiTest():
 		cmd.copyin(src=f'/tmp/{ping_log_file}', tgt=local_ping_log_file)
 		cmd.close()
 
+		ue_header = f'UE {ue.getName()} ({ueIP})'
 		with open(local_ping_log_file, 'r') as f:
 			ping_output = "".join(f.readlines())
 		result = re.search(', (?P<packetloss>[0-9\.]+)% packet loss, time [0-9\.]+ms', ping_output)
@@ -608,7 +617,7 @@ class OaiCiTest():
 	def Iperf_ComputeModifiedBW(self, idx, ue_num):
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(self.iperf_args))
 		if result is None:
-			logging.error('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
+			logging.debug('\u001B[1;37;41m Iperf bandwidth Not Found! \u001B[0m')
 			sys.exit(1)
 		iperf_bandwidth = result.group('iperf_bandwidth')
 		if self.iperf_profile == 'balanced':
@@ -626,11 +635,11 @@ class OaiCiTest():
 		iperf_bandwidth_str_new = f"-b {'%.2f' % iperf_bandwidth_new}"
 		result = re.sub(iperf_bandwidth_str, iperf_bandwidth_str_new, str(self.iperf_args))
 		if result is None:
-			logging.error('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
+			logging.debug('\u001B[1;37;41m Calculate Iperf bandwidth Failed! \u001B[0m')
 			sys.exit(1)
 		return result
 
-	def Iperf_analyzeV2TCPOutput(self, SSH, filename):
+	def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH, filename):
 
 		SSH.command(f'awk -f /tmp/tcp_iperf_stats.awk {filename}', '\$', 5)
 		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
@@ -638,34 +647,44 @@ class OaiCiTest():
 			avgbitrate = result.group('average')
 			maxbitrate = result.group('maximum')
 			minbitrate = result.group('minimum')
+			lock.acquire()
+			logging.debug(f'\u001B[1;37;44m TCP iperf result ({UE_IPAddress}) \u001B[0m')
 			msg = 'TCP Stats   :\n'
 			if avgbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Avg Bitrate : {avgbitrate} \u001B[0m')
 				msg += f'Avg Bitrate : {avgbitrate} \n'
 			if maxbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Max Bitrate : {maxbitrate} \u001B[0m')
 				msg += f'Max Bitrate : {maxbitrate} \n'
 			if minbitrate is not None:
+				logging.debug(f'\u001B[1;34m    Min Bitrate : {minbitrate} \u001B[0m')
 				msg += f'Min Bitrate : {minbitrate} \n'
-			return (True, msg)
+			statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(msg)
+			lock.release()
 
-		return (False, "could not analyze log file")
+		return 0
 
-	def Iperf_analyzeV2Output(self, iperf_real_options, EPC, SSH):
+	def Iperf_analyzeV2Output(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options,EPC,SSH):
 
 		result = re.search('-u', str(iperf_real_options))
 		if result is None:
+			logging.debug('Into Iperf_analyzeV2TCPOutput client')
 			filename = f'{EPC.SourceCodePath}/scripts/iperf_{self.testCase_id}_{device_id}.log'
-			response = self.Iperf_analyzeV2TCPOutput(SSH, filename)
+			response = self.Iperf_analyzeV2TCPOutput(lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, EPC, SSH, filename)
+			logging.debug(f'Iperf_analyzeV2TCPOutput response returned value = {response}')
 			return response
 
 		result = re.search('Server Report:', SSH.getBefore())
 		if result is None:
 			result = re.search('read failed: Connection refused', SSH.getBefore())
 			if result is not None:
-				msg = 'Could not connect to iperf server!'
-				return (False, msg)
+				logging.debug('\u001B[1;37;41m Could not connect to iperf server! \u001B[0m')
 			else:
-				msg = 'Server Report and Connection refused Not Found!'
-				return (False, msg)
+				logging.debug('\u001B[1;37;41m Server Report and Connection refused Not Found! \u001B[0m')
+			return -1
 		# Computing the requested bandwidth in float
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
 		if result is not None:
@@ -689,11 +708,14 @@ class OaiCiTest():
 			bitrate = result.group('bitrate')
 			packetloss = result.group('packetloss')
 			jitter = result.group('jitter')
-
+			lock.acquire()
+			logging.debug(f'\u001B[1;37;44m iperf result {UE_IPAddress} \u001B[0m')
 			iperfStatus = True
 			msg = f'Req Bitrate : {req_bandwidth} \n'
+			logging.debug(f'\u001B[1;34m    Req Bitrate : {req_bandwidth} \u001B[0m')
 			if bitrate is not None:
 				msg += f'Bitrate     : {bitrate} \n'
+				logging.debug(f'\u001B[1;34m    Bitrate : {bitrate}  \u001B[0m')
 				result = re.search('(?P<real_bw>[0-9\.]+) [KMG]bits/sec', str(bitrate))
 				if result is not None:
 					actual_bw = float(str(result.group('real_bw')))
@@ -709,37 +731,50 @@ class OaiCiTest():
 					br_loss = 100 * actual_bw / req_bw
 					bitperf = '%.2f ' % br_loss
 					msg += f'Bitrate Perf: {bitperf} %\n'
+					logging.debug(f'\u001B[1;34m    Bitrate Perf: {bitperf} %\u001B[0m')
 			if packetloss is not None:
 				msg += f'Packet Loss : {packetloss} %\n'
+				logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
 				if float(packetloss) > float(self.iperf_packetloss_threshold):
 					msg += 'Packet Loss too high!\n'
+					logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
 					iperfStatus = False
 			if jitter is not None:
 				msg += f'Jitter      : {jitter} \n'
-
-			return (iperfStatus, msg)
+				logging.debug(f'\u001B[1;34m    Jitter      : {jitter} \u001B[0m')
+			if (iperfStatus):
+				statusQueue.put(0)
+			else:
+				statusQueue.put(-1)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(msg)
+			lock.release()
+			return 0
 		else:
-			return (False, "could not analyze server log")
+			return -2
 
 
-	def Iperf_analyzeV2BIDIR(self, server_filename, client_filename):
+	def Iperf_analyzeV2BIDIR(self, lock, UE_IPAddress, device_id, statusQueue,server_filename,client_filename):
 
 		#check the 2 files are here 
 		if (not os.path.isfile(client_filename)) or (not os.path.isfile(server_filename)):
-			return (False, 'Bidir TCP: Client or Server Log File not present')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client or Server Log File not present')
+			return
 		#check the 2 files size
 		if (os.path.getsize(client_filename)==0) and (os.path.getsize(server_filename)==0):
-			return (False, 'Bidir TCP: Client and Server Log File are empty')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Client and Server Log File are empty')
+			return
 
-		report_msg = ''
+		report_msg='TCP BIDIR Report:\n'
 		#if client is not empty, all the info is in, otherwise we ll use the server file to get some partial info
 		client_filesize = os.path.getsize(client_filename)
 		if client_filesize == 0:
 			report_msg+="Client file (UE) present but !!! EMPTY !!!\n"
-			report_msg+="Partial report from server file"
+			report_msg+="Partial report from server file\n"
 			filename = server_filename
 		else :		
-			report_msg+="Report from client file (UE)"
+			report_msg+="Report from client file (UE)\n"
 			filename = client_filename
 
 		report=[] #used to check if relevant lines were found
@@ -749,19 +784,32 @@ class OaiCiTest():
 				result = re.search(rf'^\[\s+\d+\](?P<direction>\[.+\]).*\s+(?P<bitrate>[0-9\.]+ [KMG]bits\/sec).*\s+(?P<role>\bsender|receiver\b)', str(line))
 				if result is not None:
 					report.append(str(line))
-					report_msg += f"\n{result.group('role')} {result.group('direction')}\t: {result.group('bitrate')}"
-		if len(report) == 0:
-			return (False, 'Bidir TCP: Could not analyze from Log file')
+					report_msg+=result.group('role') + ' ' + result.group('direction')+ '\t = ' +result.group('bitrate')+'\n'
+		if len(report)>0:
+			lock.acquire()
+			statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			statusQueue.put(report_msg)
+			logging.debug(f'\u001B[1;37;45m TCP Bidir Iperf Result ({UE_IPAddress}) \u001B[0m')
+			for rLine in report_msg.split('\n'):
+				logging.debug(f'\u001B[1;35m    {rLine} \u001B[0m')
+			lock.release()
+		else:
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Bidir TCP : Could not analyze from Log file')
 
-		return (True, report_msg)
 
-	def Iperf_analyzeV2Server(self, iperf_real_options, filename, type):
+
+	def Iperf_analyzeV2Server(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options, filename,type):
 		if (not os.path.isfile(filename)):
-			return (False, 'Could not analyze from server log')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
+			return
 		# Computing the requested bandwidth in float
 		result = re.search('-b (?P<iperf_bandwidth>[0-9\.]+)[KMG]', str(iperf_real_options))
 		if result is None:
-			return (False, 'Could not compute Iperf bandwidth!')
+			logging.debug('Iperf bandwidth Not Found!')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not compute Iperf bandwidth!')
+			return
 		else:
 			req_bandwidth = result.group('iperf_bandwidth')
 			req_bw = float(req_bandwidth)
@@ -808,8 +856,6 @@ class OaiCiTest():
 				br_sum = curr_br + br_sum
 				ji_sum = float(ji[0]) + ji_sum
 
-		server_file.close()
-
 		if (row_idx > 0):
 			br_sum = br_sum / row_idx
 			ji_sum = ji_sum / row_idx
@@ -830,25 +876,87 @@ class OaiCiTest():
 				pl = float(100 * pl_sum / ps_sum)
 				packetloss = '%2.1f ' % (pl)
 				packetloss += '%'
-
-			result = float(br_loss) >= float(self.iperf_bitrate_threshold) and float(pl) <= float(self.iperf_packetloss_threshold)
+				#checking packet loss compliance
+				if float(pl) > float(self.iperf_packetloss_threshold):
+					pal_too_high_msg = 'Packet Loss too high :  tested = '+packetloss+', target = '+self.iperf_packetloss_threshold+'%'
+				else:
+					pal_too_high_msg='Packet Loss value is within acceptance range'
+				#checking bitrate perf compliance
+				if float(br_loss) < float(self.iperf_bitrate_threshold):
+					bit_too_low_msg = 'Bitrate too low :  tested = '+bitperf+', target = '+self.iperf_bitrate_threshold+'%'
+				else:
+					bit_too_low_msg='Bitrate perf value is within acceptance range'
+			lock.acquire()
+			if (float(br_loss) < float(self.iperf_bitrate_threshold)) and (float(pl) > float(self.iperf_packetloss_threshold)):
+				statusQueue.put(-1)
+			elif (float(br_loss) < float(self.iperf_bitrate_threshold)) or (float(pl) > float(self.iperf_packetloss_threshold)): 
+				statusQueue.put(1)
+			else:
+				statusQueue.put(0)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
 			req_msg = f'Req Bitrate : {req_bandwidth}'
 			bir_msg = f'Bitrate     : {bitrate}'
 			brl_msg = f'Bitrate Perf: {bitperf}'
-			if float(br_loss) < float(self.iperf_bitrate_threshold):
-				brl_msg += f' (too low! <{self.iperf_bitrate_threshold}%)'
 			jit_msg = f'Jitter      : {jitter}'
 			pal_msg = f'Packet Loss : {packetloss}'
-			if float(pl) > float(self.iperf_packetloss_threshold):
-				pal_msg += f' (too high! >{self.iperf_packetloss_threshold}%)'
-			return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
+			statusQueue.put(f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}\n{pal_too_high_msg}\n{bit_too_low_msg}\n')
+			logging.debug(f'\u001B[1;37;45m iperf result ({UE_IPAddress}) \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {req_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bir_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {brl_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {jit_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {pal_too_high_msg} \u001B[0m')
+			logging.debug(f'\u001B[1;35m    {bit_too_low_msg} \u001B[0m')
+			lock.release()
 		else:
-			return (False, 'Could not analyze from server log')
+			self.ping_iperf_wrong_exit(lock, UE_IPAddress, device_id, statusQueue, 'Could not analyze from server log')
 
-	def Iperf_Module(self, EPC, ue, RAN, idx, ue_num):
-		ueIP = ue.getIP()
-		if not ueIP:
-			return (False, f"UE {ue.getName()} has no IP address")
+		server_file.close()
+
+
+	def Iperf_analyzeV3Output(self, lock, UE_IPAddress, device_id, statusQueue,SSH):
+
+		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\r\n(?:|\[ *\d+\] Sent \d+ datagrams)\r\niperf Done\.', SSH.getBefore())
+		if result is None:
+			result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', SSH.getBefore())
+			lock.acquire()
+			statusQueue.put(-1)
+			statusQueue.put(device_id)
+			statusQueue.put(UE_IPAddress)
+			if result is not None:
+				logging.debug(f"\u001B[1;37;41m {result.group('error')} \u001B[0m")
+				statusQueue.put(result.group('error'))
+			else:
+				logging.debug('\u001B[1;37;41m Bitrate and/or Packet Loss Not Found! \u001B[0m')
+				statusQueue.put('Bitrate and/or Packet Loss Not Found!')
+			lock.release()
+
+		bitrate = result.group('bitrate')
+		packetloss = result.group('packetloss')
+		lock.acquire()
+		logging.debug(f'\u001B[1;37;44m iperf result ({UE_IPAddress}) \u001B[0m')
+		logging.debug(f'\u001B[1;34m    Bitrate     : {bitrate} \u001B[0m')
+		msg = f'Bitrate     : {bitrate} \n'
+		iperfStatus = True
+		if packetloss is not None:
+			logging.debug(f'\u001B[1;34m    Packet Loss : {packetloss} %\u001B[0m')
+			msg += f'Packet Loss : {packetloss} %\n'
+			if float(packetloss) > float(self.iperf_packetloss_threshold):
+				logging.debug('\u001B[1;37;41m Packet Loss too high \u001B[0m')
+				msg += 'Packet Loss too high!\n'
+				iperfStatus = False
+		if (iperfStatus):
+			statusQueue.put(0)
+		else:
+			statusQueue.put(-1)
+		statusQueue.put(device_id)
+		statusQueue.put(UE_IPAddress)
+		statusQueue.put(msg)
+		lock.release()
+
+	def Iperf_Module(self, lock, statusQueue, EPC, ue, RAN, idx, ue_num):
 		SSH = sshconnection.SSHConnection()
 		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
 		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
@@ -879,18 +987,16 @@ class OaiCiTest():
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf' if re.search('adb', ue.getName()) else 'iperf'
 
-		ue_header = f'UE {ue.getName()} ({ueIP})'
-
 		if self.iperf_direction == "DL":
 			logging.debug("Iperf in DL requested")
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm {server_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ueIP} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -s -B {ue.getIP()} {udpSwitch} -i 1 -t {iperf_time * 1.5} {port} &> /tmp/{server_filename} &')
 			cmd.close()
 
 			cmd = cls_cmd.getConnection(EPC.IPAddress)
 			cmd.run(f'rm {EPC.SourceCodePath}/{client_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf -c {ueIP} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
+			cmd.run(f'{cn_iperf_prefix} iperf -c {ue.getIP()} {iperf_opt} {port} &> {EPC.SourceCodePath}/{client_filename}', timeout=iperf_time * 1.5)
 			cmd.copyin(f'{EPC.SourceCodePath}/{client_filename}', client_filename)
 			cmd.close()
 
@@ -899,10 +1005,10 @@ class OaiCiTest():
 			cmd.close()
 
 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"{EPC.SourceCodePath}/{client_filename}")
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"{EPC.SourceCodePath}/{client_filename}")
 				cmd.close()
 
 		elif self.iperf_direction == "UL":
@@ -914,7 +1020,7 @@ class OaiCiTest():
 
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{client_filename}', client_filename)
 			cmd.close()
 
@@ -923,10 +1029,10 @@ class OaiCiTest():
 			cmd.close()
 
 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(ue.getHost())
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f"/tmp/{client_filename}")
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f"/tmp/{client_filename}")
 				cmd.close()
 
 		elif self.iperf_direction=="BIDIR":
@@ -938,7 +1044,7 @@ class OaiCiTest():
 
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{client_filename}')
-			cmd.run(f'iperf3 -B {ueIP} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'iperf3 -B {ue.getIP()} -c {cn_target_ip} {iperf_opt} {port} &> /tmp/{client_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{client_filename}', client_filename)
 			cmd.close()
 
@@ -946,32 +1052,129 @@ class OaiCiTest():
 			cmd.copyin(f'{EPC.SourceCodePath}/{server_filename}', server_filename)
 			cmd.close()
 
-			status, msg = self.Iperf_analyzeV2BIDIR(server_filename, client_filename)
+			self.Iperf_analyzeV2BIDIR(lock, ue.getHost(), ue.getName(), statusQueue, server_filename, client_filename)
 
 		elif self.iperf_direction == "IPERF3":
 			cmd = cls_cmd.getConnection(ue.getHost())
 			cmd.run(f'rm /tmp/{server_filename}', reportNonZero=False)
 			port = f'{5002+idx}'
-			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ueIP} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
+			cmd.run(f'{ue.getCmdPrefix()} iperf3 -B {ue.getIP()} -c {cn_target_ip} -p {port} {iperf_opt} --get-server-output &> /tmp/{server_filename}', timeout=iperf_time*1.5)
 			cmd.copyin(f'/tmp/{server_filename}', server_filename)
 			cmd.close()
 			if udpIperf:
-				status, msg = self.Iperf_analyzeV2Server(iperf_opt, server_filename, 1)
+				self.Iperf_analyzeV2Server(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, server_filename, 1)
 			else:
 				cmd = cls_cmd.getConnection(EPC.IPAddress)
-				status, msg = self.Iperf_analyzeV2TCPOutput(cmd, f'/tmp/{server_filename}')
+				self.Iperf_analyzeV2TCPOutput(lock, ue.getIP(), ue.getName(), statusQueue, iperf_opt, EPC, cmd, f'/tmp/{server_filename}')
 				cmd.close()
 
 		else :
 			raise Exception("Incorrect or missing IPERF direction in XML")
 
-		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
-		for l in msg.split('\n'):
-			logging.info(f'\u001B[1;35m    {l} \u001B[0m')
-		return (status, f'{ue_header}\n{msg}')
-
 	def IperfNoS1(self,HTML,RAN,EPC,CONTAINERS):
-		raise 'IperfNoS1 not implemented'
+		SSH = sshconnection.SSHConnection()
+		if RAN.eNBIPAddress == '' or RAN.eNBUserName == '' or RAN.eNBPassword == '' or self.UEIPAddress == '' or self.UEUserName == '' or self.UEPassword == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		check_eNB = True
+		check_OAI_UE = True
+		server_on_enb = re.search('-R', str(self.iperf_args))
+		if server_on_enb is not None:
+			iServerIPAddr = RAN.eNBIPAddress
+			iServerUser = RAN.eNBUserName
+			iServerPasswd = RAN.eNBPassword
+			iClientIPAddr = self.UEIPAddress
+			iClientUser = self.UEUserName
+			iClientPasswd = self.UEPassword
+		else:
+			iServerIPAddr = self.UEIPAddress
+			iServerUser = self.UEUserName
+			iServerPasswd = self.UEPassword
+			iClientIPAddr = RAN.eNBIPAddress
+			iClientUser = RAN.eNBUserName
+			iClientPasswd = RAN.eNBPassword
+		if self.iperf_options != 'sink':
+			# Starting the iperf server
+			SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
+			# args SHALL be "-c client -u any"
+			# -c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1
+			# -B 10.0.1.1 -u -s -i 1 -fm
+			server_options = re.sub('-u.*$', '-u -s -i 1 -fm', str(self.iperf_args))
+			server_options = server_options.replace('-c','-B')
+			SSH.command(f'rm -f /tmp/tmp_iperf_server_{self.testCase_id}.log', '\$', 5)
+			SSH.command(f'echo $USER; nohup iperf {server_options} > /tmp/tmp_iperf_server_{self.testCase_id}.log 2>&1 &', iServerUser, 5)
+			time.sleep(0.5)
+			SSH.close()
+
+		# Starting the iperf client
+		modified_options = self.Iperf_ComputeModifiedBW(0, 1)
+		modified_options = modified_options.replace('-R','')
+		iperf_time = self.Iperf_ComputeTime()
+		SSH.open(iClientIPAddr, iClientUser, iClientPasswd)
+		SSH.command(f'rm -f /tmp/tmp_iperf_{self.testCase_id}.log', '\$', 5)
+		iperf_status = SSH.command(f'stdbuf -o0 iperf {modified_options} 2>&1 | stdbuf -o0 tee /tmp/tmp_iperf_{self.testCase_id}.log', '\$', int(iperf_time)*5.0)
+		status_queue = SimpleQueue()
+		lock = Lock()
+		if iperf_status < 0:
+			message = 'iperf on OAI UE crashed due to TIMEOUT !'
+			logging.debug(f'\u001B[1;37;41m {message} \u001B[0m')
+			clientStatus = -2
+		else:
+			if self.iperf_options == 'sink':
+				clientStatus = 0
+				status_queue.put(0)
+				status_queue.put('OAI-UE')
+				status_queue.put('10.0.1.2')
+				status_queue.put('Sink Test : no check')
+			else:
+				clientStatus = self.Iperf_analyzeV2Output(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options, EPC,SSH)
+		SSH.close()
+
+		# Stopping the iperf server
+		if self.iperf_options != 'sink':
+			SSH.open(iServerIPAddr, iServerUser, iServerPasswd)
+			SSH.command('killall --signal SIGKILL iperf', '\$', 5)
+			time.sleep(0.5)
+			SSH.close()
+
+		if (clientStatus == -1):
+			if (os.path.isfile(f'iperf_server_{self.testCase_id}.log')):
+				os.remove(f'iperf_server_{self.testCase_id}.log')
+			SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			filename=f'iperf_server_{self.testCase_id}_OAI-UE.log'
+			self.Iperf_analyzeV2Server(lock, '10.0.1.2', 'OAI-UE', status_queue, modified_options,filename,0)
+
+		# copying on the EPC server for logCollection
+		if (clientStatus == -1):
+			copyin_res = SSH.copyin(iServerIPAddr, iServerUser, iServerPasswd, f'/tmp/tmp_iperf_server_{self.testCase_id}.log', f'iperf_server_{self.testCase_id}_OAI-UE.log')
+			if (copyin_res == 0):
+				SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_server_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+		copyin_res = SSH.copyin(iClientIPAddr, iClientUser, iClientPasswd, f'/tmp/tmp_iperf_{self.testCase_id}.log', f'iperf_{self.testCase_id}_OAI-UE.log')
+		if (copyin_res == 0):
+			SSH.copyout(EPC.IPAddress, EPC.UserName, EPC.Password, f'iperf_{self.testCase_id}_OAI-UE.log', f'{EPC.SourceCodePath}/scripts')
+		iperf_noperf = False
+		if status_queue.empty():
+			iperf_status = False
+		else:
+			iperf_status = True
+		messages = []
+		while (not status_queue.empty()):
+			count = status_queue.get()
+			if (count < 0):
+				iperf_status = False
+			if (count > 0):
+				iperf_noperf = True
+			device_id = status_queue.get()
+			ip_addr = status_queue.get()
+			message = status_queue.get()
+			messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{message}')
+		if (iperf_noperf and iperf_status):
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
+		elif (iperf_status):
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
+		else:
+			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def Iperf(self,HTML,RAN,EPC,CONTAINERS):
 		result = re.search('noS1', str(RAN.Initialize_eNB_args))
@@ -984,18 +1187,64 @@ class OaiCiTest():
 
 		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_direction "{self.iperf_direction}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')
 
-		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = []
+		for ue_name in self.ue_ids:
+			ue = cls_module_ue.Module_UE(ue_name)
+			if not ue.getIP():
+				logging.error("no IP addresses returned")
+				HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+			ues.append(ue)
 		logging.debug(ues)
-		with concurrent.futures.ThreadPoolExecutor() as executor:
-			futures = [executor.submit(self.Iperf_Module, EPC, ue, RAN, i, len(ues)) for i, ue in enumerate(ues)]
-			results = [f.result() for f in futures]
-			# each result in results is a tuple, first member goes to successes, second to messages
-			successes, messages = map(list, zip(*results))
-		if len(successes) == len(ues) and all(successes):
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
-		else:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+
+		self.dummyIperfVersion = '2.0.10'
+		#cmd = 'iperf --version'
+		#logging.debug(cmd + '\n')
+		#iperfStdout = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+		#result = re.search('iperf version 2.0.5', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.5'
+		#result = re.search('iperf version 2.0.10', str(iperfStdout.strip()))
+		#if result is not None:
+		#	dummyIperfVersion = '2.0.10'
+		multi_jobs = []
+		ue_num = len(ues)
+		i = 0
+		lock = Lock()
+		status_queue = SimpleQueue()
+		for ue in ues:
+			p = Process(target = self.Iperf_Module ,args = (lock, status_queue, EPC, ue, RAN, i, ue_num))
+			p.daemon = True
+			p.start()
+			multi_jobs.append(p)
+			i = i + 1
+		for job in multi_jobs:
+			job.join()
+
+		if (status_queue.empty()):
+			HTML.CreateHtmlTestRow(self.iperf_args, 'KO', CONST.ALL_PROCESSES_OK)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
+		else:
+			iperf_status = True
+			iperf_noperf = False
+			messages = []
+			while (not status_queue.empty()):
+				count = status_queue.get()
+				if (count < 0):
+					iperf_status = False
+				if (count > 0):
+					iperf_noperf = True
+				device_id = status_queue.get()
+				ip_addr = status_queue.get()
+				msg = status_queue.get()
+				messages.append(f'UE ({device_id})\nIP Address  : {ip_addr}\n{msg}')
+			if (iperf_noperf and iperf_status):
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'PERF NOT MET', messages)
+			elif (iperf_status):
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', messages)
+			else:
+				HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
+				self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
 		if (not os.path.isfile(f'./{UElogFile}')):

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/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -237,7 +237,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
 
     }
 );  

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -237,7 +237,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
 
     }
 );  

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -237,7 +237,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";
 
     }
 );  

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

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

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

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

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

@@ -1,89 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    E1_INTERFACE =
-    (
-      {
-        type = "cp";
-        ipv4_cucp = "192.168.68.194";
-        port_cucp = 38462;
-        ipv4_cuup = "192.168.68.196";
-        port_cuup = 38462;
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-};

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

@@ -1,78 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "lo";
-    local_s_address = "192.168.68.196";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    E1_INTERFACE =
-    (
-      {
-        type = "up";
-        ipv4_cucp = "192.168.68.194";
-        ipv4_cuup = "192.168.68.196";
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-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

@@ -22,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    force_256qam_off = 1;
 
     servingCellConfigCommon = (
     {

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

@@ -22,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    force_256qam_off = 1;
 
 
     servingCellConfigCommon = (
@@ -217,6 +218,15 @@ THREAD_STRUCT = (
   }
 );
 
-log_config : {
-  global_log_level = "info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };

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

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

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -22,7 +22,7 @@ gNBs =
 
     ////////// Physical parameters:
     pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
     do_SRS                                                    = 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/lteue.usim-ci-magma.conf

@@ -1,45 +0,0 @@
-# List of known PLMNS
-PLMN: {
-    PLMN0: {
-           FULLNAME="OpenAirInterface";
-           SHORTNAME="OAICN";
-           MNC="92";
-           MCC="208";
-    };
-};
-
-UE0:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="1000000003";
-        USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
-        OPC="c42449363bbad02b66d16bc975d77cc1";
-        MSISDN="001011234561010";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20892";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20892");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};

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

@@ -15,7 +15,7 @@ Ref :
   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/doGitLabMerge.sh

@@ -135,6 +135,8 @@ then
     exit $STATUS
 fi
 
+git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG
+
 git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
 
 STATUS=`git status | egrep -c "You have unmerged paths.|fix conflicts"`

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

@@ -643,7 +643,7 @@ class EPCManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		mySSH.command('docker-compose --version', '\$', 5)
-		result = re.search('docker-compose version 1|Docker Compose version v2', mySSH.getBefore())
+		result = re.search('docker-compose version 1', mySSH.getBefore())
 		if result is None:
 			mySSH.close()
 			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
@@ -659,7 +659,6 @@ class EPCManagement():
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/logs ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/logs ; fi', '\$', 5)
 		mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts ' + self.SourceCodePath + '/logs', '\$', 5)
-		mySSH.command('rm -f ' + self.SourceCodePath + '/*.log', '\$', 5)
 
 		# deploying and configuring the cassandra database
 		# container names and services are currently hard-coded.
@@ -679,7 +678,7 @@ class EPCManagement():
 			mySSH.copyout(self.IPAddress, self.UserName, self.Password, './' + self.yamlPath + '/mme.conf', self.SourceCodePath + '/scripts')
 			mySSH.command('chmod 775 entrypoint.sh', '\$', 60)
 		mySSH.command('wget --quiet --tries=3 --retry-connrefused https://raw.githubusercontent.com/OPENAIRINTERFACE/openair-hss/develop/src/hss_rel14/db/oai_db.cql', '\$', 30)
-		mySSH.command('docker-compose down -v', '\$', 60)
+		mySSH.command('docker-compose down', '\$', 60)
 		mySSH.command('docker-compose up -d db_init', '\$', 60)
 		# databases take time...
 		time.sleep(10)
@@ -831,7 +830,8 @@ class EPCManagement():
 			listOfContainers += ' prod-trf-gen'
 			nbContainers += 1
 
-		mySSH.command('docker-compose down -v', '\$', 60)
+		mySSH.command('docker-compose down', '\$', 60)
+		mySSH.command('docker volume prune --force || true', '\$', 60)
 		mySSH.command('docker inspect --format=\'{{.State.Health.Status}}\' ' + listOfContainers, '\$', 10)
 		noMoreContainerNb = mySSH.getBefore().count('No such object')
 		mySSH.command('docker inspect --format=\'{{.Name}}\' prod-oai-public-net prod-oai-private-net', '\$', 10)

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_l2sim_tdd.xml

@@ -32,7 +32,7 @@
  000001
  000002
  000003
- 000004
+ 000011
  200000
  020001
  020002
@@ -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_fdd_phytest.xml

@@ -28,7 +28,6 @@
         <TestCaseRequestedList>
  111111
  100011
- 004000
  000010
  000011
  020011
@@ -46,13 +45,6 @@
                 <images_to_pull>oai-gnb oai-nr-ue</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>
-        </testCase>
-
         <testCase id="000010">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI 5G gNB RF sim SA</desc>

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
@@ -44,13 +43,6 @@
                 <images_to_pull>oai-gnb oai-nr-ue</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>
-        </testCase>
-
         <testCase id="000000">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI gNB</desc>

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
@@ -44,13 +43,6 @@
                 <images_to_pull>oai-gnb oai-nr-ue</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>
-        </testCase>
-
         <testCase id="000000">
                 <class>DeployGenObject</class>
                 <desc>Deploy OAI gNB</desc>

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_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_lte_b200_fdd_05Mhz_tm1.xml

@@ -120,7 +120,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
@@ -179,7 +178,6 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
         <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>single-ue</iperf_profile>
         <direction>UL</direction>
         <id>adb_ue_1</id>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -128,7 +128,6 @@
         <desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
     </testCase>
@@ -157,7 +156,6 @@
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>UL</direction>
         <id>adb_ue_1 adb_ue_2</id>
@@ -168,7 +166,6 @@
         <desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
         <iperf_args>-u -b 9M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>single-ue</iperf_profile>
         <direction>UL</direction>
         <id>adb_ue_1</id>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -114,7 +114,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -107,7 +107,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>iperf (10MHz - DL/30Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 30M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -1,174 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-    <htmlTabRef>test-fdd-10-tm1</htmlTabRef>
-    <htmlTabName>Test-FDD-10MHz-TM1</htmlTabName>
-    <htmlTabIcon>tasks</htmlTabIcon>
-    <TestCaseRequestedList>
-100000
-100001
-111110
-111111
-030111
-000001
-030311
-000002
-040511 040613 040616 040651
-030411
-000001
-030211
-200000
-200001
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="111110">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
-    </testCase>
-    <testCase id="111111">
-        <class>Pull_Local_Registry</class>
-        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>1</test_svr_id>
-        <images_to_pull>oai-lte-ue</images_to_pull>
-    </testCase>
-    <testCase id="100000">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="100001">
-        <class>Custom_Command</class>
-        <desc>Disable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -D 0</command>
-    </testCase>
-    <testCase id="200000">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States (hutch)</desc>
-        <node>hutch</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-    <testCase id="200001">
-        <class>Custom_Command</class>
-        <desc>Enable Sleep States (carabe)</desc>
-        <node>carabe</node>
-        <command>sudo cpupower idle-set -E</command>
-    </testCase>
-
-    <testCase id="030111">
-        <class>Deploy_Object</class>
-        <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030311">
-        <class>Deploy_Object</class>
-        <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-    <testCase id="000001">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="000002">
-        <class>IdleSleep</class>
-        <desc>Sleep</desc>
-        <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
-    </testCase>
-
-    <testCase id="030211">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy eNB</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
-
-    <testCase id="030411">
-        <class>Undeploy_Object</class>
-        <desc>Undeploy LTE-UE</desc>
-        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
-        <eNB_instance>1</eNB_instance>
-        <eNB_serverId>1</eNB_serverId>
-    </testCase>
-
-    <testCase id="040511">
-        <class>Ping</class>
-        <desc>ping (10MHz - 20 sec)</desc>
-        <ping_args>-c 20 192.168.61.200</ping_args>
-        <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040613">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040616">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - DL/TCP)(30 sec)(single-ue profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>DL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040651">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/10Mbps/UDP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-u -b 10M -t 30 -i 1</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>single-ue</iperf_profile>
-        <direction>UL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-    <testCase id="040654">
-        <class>Iperf</class>
-        <desc>iperf (10MHz - UL/TCP)(30 sec)(balanced profile)</desc>
-        <iperf_args>-t 30 -i 1 -fm</iperf_args>
-        <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_profile>balanced</iperf_profile>
-        <direction>UL</direction>
-        <id>lte_oai_ue_carabe</id>
-    </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml

@@ -1,45 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-    <htmlTabRef>images-clean-up</htmlTabRef>
-    <htmlTabName>Images Clean-Up</htmlTabName>
-    <htmlTabIcon>trash</htmlTabIcon>
-    <TestCaseRequestedList>
-222222
-333333
-    </TestCaseRequestedList>
-    <TestCaseExclusionList></TestCaseExclusionList>
-
-    <testCase id="222222">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on eNB Test Server</desc>
-        <test_svr_id>0</test_svr_id>
-    </testCase>
-
-    <testCase id="333333">
-        <class>Clean_Test_Server_Images</class>
-        <desc>Clean Test Images on LTE-UE Test Server</desc>
-        <test_svr_id>1</test_svr_id>
-    </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -113,7 +113,6 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(balanced profile)</desc>
         <iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -121,7 +121,6 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -129,7 +129,6 @@
         <desc>iperf (5MHz - DL/6.5Mbps/UDP)(30 sec)(balanced)</desc>
         <iperf_args>-u -b 6.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -111,7 +111,6 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <desc>iperf (10MHz - DL/13.5Mbps/UDP)(30 sec)(balanced)</desc>
         <iperf_args>-u -b 13.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -113,7 +113,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>balanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>
@@ -124,7 +123,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>single-ue</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1</id>
@@ -135,7 +133,6 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
         <iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-        <iperf_bitrate_threshold>50</iperf_bitrate_threshold>
         <iperf_profile>unbalanced</iperf_profile>
         <direction>DL</direction>
         <id>adb_ue_1 adb_ue_2</id>

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_e1_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_e1_b200_terminate.xml

@@ -1,48 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>TEST-SA-FR1-F1-E1-B200-terminate</htmlTabRef>
-  <htmlTabName>Tear-down</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-  330201
-  222222
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="330201">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy CU-CP/CU-UP/DU</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_e1_b200_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="222222">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -39,22 +39,22 @@
     110011
     110001
     150001
-    160001
-    100002
-    160002
-    150001
     110011
     110001
     150000
-    170001
-    170000
-    170002
     110011
     110002
     100001
     130201
     200000
   </TestCaseRequestedList>
+    <!--
+ 070001
+ 070000
+ 070002
+ 050002
+ 050003
+    -->
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="110000">
@@ -118,7 +118,7 @@
   <testCase id="100002">
     <class>IdleSleep</class>
     <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+    <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
   </testCase>
 
   <testCase id="150000">
@@ -159,19 +159,19 @@
 
   <testCase id="170000">
     <class>Iperf</class>
-    <desc>iperf (DL/80Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
     <direction>DL</direction>
     <id>idefix</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
   <testCase id="170001">
     <class>Iperf</class>
-    <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (UL/8Mbps/UDP)(60 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 8M -t 60 -i 1 -fm</iperf_args>
     <direction>UL</direction>
     <id>idefix</id>
     <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
@@ -181,36 +181,21 @@
 
   <testCase id="170002">
     <class>Iperf</class>
-    <desc>iperf (BIDIR TCP)(20 sec)(single-ue profile)</desc>
-    <iperf_args>-t 20 --bidir</iperf_args>
+    <desc>iperf (BIDIR TCP)(10 sec)(single-ue profile)</desc>
+    <iperf_args>-t 10 --bidir</iperf_args>
     <direction>BIDIR</direction>
     <id>idefix</id>
     <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
-  <testCase id="160001">
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU)</desc>
-    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-  <testCase id="160002">
-    <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
   <testCase id="130201">
     <class>Undeploy_Object</class>
     <desc>Undeploy CU-DU</desc>
     <yaml_path>ci-scripts/yaml_files/sa_f1_b200_gnb</yaml_path>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
-    <d_retx_th>10,100,100,100</d_retx_th>
-    <u_retx_th>10,100,100,100</u_retx_th>
+    <d_retx_th>1,100,100,100</d_retx_th>
+    <u_retx_th>1,100,100,100</u_retx_th>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_f1_b200_terminate.xml

@@ -27,6 +27,7 @@
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
   230201
+  222222
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
@@ -38,4 +39,10 @@
     <eNB_serverId>0</eNB_serverId>
   </testCase>
 
+  <testCase id="222222">
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <test_svr_id>0</test_svr_id>
+  </testCase>
+
 </testCaseList>

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/lte_oai_cn_deploy.xml

@@ -1,39 +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>epc-deploy-tab</htmlTabRef>
-	<htmlTabName>EPC-Deploy</htmlTabName>
-	<htmlTabIcon>log-in</htmlTabIcon>
-	<TestCaseRequestedList>
- 000100
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000100">
-		<class>Deploy_EPC</class>
-		<desc>Deploy all EPC containers</desc>
-		<parameters>yaml_files/magma_lte_20892</parameters>
-	</testCase>
-
-</testCaseList>

ci-scripts/xml_files/lte_oai_cn_undeploy.xml

@@ -1,38 +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>epc-undeploy-tab</htmlTabRef>
-	<htmlTabName>EPC-Undeploy</htmlTabName>
-	<htmlTabIcon>log-out</htmlTabIcon>
-	<TestCaseRequestedList>
- 000200
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000200">
-		<class>Undeploy_EPC</class>
-		<desc>Undeploy all EPC containers</desc>
-	</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_fdd_rfsimulator/docker-compose.yaml

@@ -185,7 +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
+            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_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_fdd_phytest/docker-compose.yaml

@@ -23,7 +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
+            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

@@ -23,7 +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
+            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

@@ -23,7 +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
+            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

@@ -186,7 +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
+            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/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml

@@ -1,21 +0,0 @@
-version: '3.8'
-
-services:
-    lte_ue0:
-        image: oai-lte-ue:latest
-        privileged: true
-        container_name: lte-b200-ue-fdd-10Mhz-tm1
-        environment:
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 50 --ue-rxgain 120 --ue-txgain 0 --ue-max-power 0 --ue-scan-carrier --log_config.global_log_options level,nocolor,time
-        volumes:
-            - ../../conf_files/lteue.usim-ci-magma.conf:/opt/oai-lte-ue/etc/ue_usim.conf
-            - /dev:/dev
-        network_mode: "host"
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-

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

@@ -1,20 +0,0 @@
-version: '3.8'
-
-services:
-    enb_mono_fdd:
-        image: oai-enb:latest
-        privileged: true
-        container_name: lte-b200-enb-fdd-10Mhz-tm1
-        environment:
-            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].mme_ip_address.[0].ipv4 192.168.61.195 --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/enb.band7.50prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf
-            - /dev:/dev
-        network_mode: "host"
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5

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

@@ -1,198 +0,0 @@
-version: '3.8'
-
-services:
-    cassandra:
-        image: cassandra:2.1
-        container_name: prod-cassandra
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.2
-        environment:
-            CASSANDRA_CLUSTER_NAME: "OAI HSS Cluster"
-            CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
-        healthcheck:
-            test: /bin/bash -c "nodetool status"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    db_init:
-        image: cassandra:2.1
-        container_name: prod-db-init
-        depends_on: [cassandra]
-        deploy:
-            restart_policy:
-                condition: on-failure
-                max_attempts: 10
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.4
-        volumes:
-            - ./oai_db.cql:/home/oai_db.cql
-        entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
-
-    oai_hss:
-        image: oaisoftwarealliance/oai-hss:develop
-        container_name: prod-oai-hss
-        privileged: true
-        depends_on: [cassandra]
-        networks:
-            private_net:
-                ipv4_address: 192.168.68.3
-            public_net:
-                ipv4_address: 192.168.61.194
-        environment:
-            TZ: Europe/Paris
-            REALM: openairinterface.org
-            HSS_FQDN: hss.openairinterface.org
-            PREFIX: /openair-hss/etc
-            cassandra_Server_IP: 192.168.68.2
-            OP_KEY: 1006020f0a478bf6b699f15c062e42b3
-            LTE_K: FEC86BA6EB707ED08905757B1BB44B8F 
-            APN1: oai.ipv4
-            APN2: oai2.ipv4
-            FIRST_IMSI: 208921000000001 
-            NB_USERS: 10
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_hss"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    redis:
-        image: redis:6.0.5
-        container_name: prod-redis
-        privileged: true
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.198
-        volumes:
-            - ./redis_extern.conf:/usr/local/etc/redis/redis.conf
-        entrypoint: /bin/bash -c "redis-server /usr/local/etc/redis/redis.conf"
-        healthcheck:
-            test: /bin/bash -c "redis-cli -h 192.168.61.198 -p 6380 ping"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    magma_mme:
-        image: magma-mme:production
-        container_name: prod-magma-mme
-        hostname: mme
-        privileged: true
-        depends_on: [oai_hss, redis]
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.195
-        environment:
-            TZ: Europe/Paris
-            REALM: openairinterface.org
-            PREFIX: /openair-mme/etc
-            HSS_HOSTNAME: hss
-            HSS_FQDN: hss.openairinterface.org
-            HSS_REALM: openairinterface.org
-            MME_FQDN: mme.openairinterface.org
-            FEATURES: mme_oai
-        volumes:
-            - ./mme_fd.sprint.conf:/magma-mme/etc/mme_fd.conf.tmplt
-            - ./mme.conf:/magma-mme/etc/mme.conf
-            - ./entrypoint.sh:/magma-mme/bin/entrypoint.sh
-        entrypoint: /bin/bash -c "/magma-mme/bin/entrypoint.sh"
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_mme"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai_spgwc:
-        image: oaisoftwarealliance/oai-spgwc:develop
-        privileged: true
-        depends_on: [magma_mme]
-        container_name: prod-oai-spgwc
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.196
-        environment:
-            TZ: Europe/Paris
-            SGW_INTERFACE_NAME_FOR_S11: eth0
-            PGW_INTERFACE_NAME_FOR_SX: eth0
-            DEFAULT_DNS_IPV4_ADDRESS: 172.21.3.100
-            DEFAULT_DNS_SEC_IPV4_ADDRESS: 8.8.4.4
-            PUSH_PROTOCOL_OPTION: 'true'
-            APN_NI_1: oai.ipv4
-            APN_NI_2: oai2.ipv4
-            DEFAULT_APN_NI_1: oai.ipv4
-            UE_IP_ADDRESS_POOL_1: '12.1.1.2 - 12.1.1.254'
-            UE_IP_ADDRESS_POOL_2: '12.0.0.2 - 12.0.0.254'
-            MCC: '208'
-            MNC: '92'
-            MNC03: '092'
-            TAC: 1
-            GW_ID: 1
-            REALM: openairinterface.org
-            UE_MTU_IPV4: 1500
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_spgwc"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai_spgwu:
-        image: oaisoftwarealliance/oai-spgwu-tiny:develop
-        privileged: true
-        container_name: prod-oai-spgwu-tiny
-        depends_on: [oai_spgwc]
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.197
-        environment:
-            TZ: Europe/Paris
-            PID_DIRECTORY: /var/run
-            INSTANCE: 1
-            SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP: eth0
-            PGW_INTERFACE_NAME_FOR_SGI: eth0
-            SGW_INTERFACE_NAME_FOR_SX: eth0
-            SPGWC0_IP_ADDRESS: 192.168.61.196
-            NETWORK_UE_IP: '12.1.1.0/24'
-            NETWORK_UE_NAT_OPTION: 'yes'
-            MCC: '208'
-            MNC: '92'
-            MNC03: '092'
-            TAC: 1
-            GW_ID: 1
-            REALM: openairinterface.org
-        healthcheck:
-            test: /bin/bash -c "pgrep oai_spgwu"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    trf_gen:
-        image: oaisoftwarealliance/trf-gen-cn5g:focal
-        privileged: true
-        container_name: prod-trf-gen
-        networks:
-            public_net:
-                ipv4_address: 192.168.61.200
-        entrypoint: /bin/bash -c "ip route add 12.1.1.0/24 via 192.168.61.197 dev eth0; sleep infinity"
-        healthcheck:
-            test: /bin/bash -c "ip route | grep '12.1.1.0'"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    private_net:
-        name: prod-oai-private-net
-        ipam:
-            config:
-                - subnet: 192.168.68.0/26
-        driver_opts:
-            com.docker.network.bridge.name: "oai-priv-net"
-    public_net:
-        name: prod-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.61.192/26
-        driver_opts:
-            com.docker.network.bridge.name: "oai-pub-net"

ci-scripts/yaml_files/magma_lte_20892/entrypoint.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-INSTANCE=1
-PREFIX='/magma-mme/etc'
-MY_REALM='openairinterface.org'
-
-declare -A MME_CONF
-
-pushd $PREFIX
-MME_CONF[@MME_S6A_IP_ADDR@]="192.168.61.195"
-MME_CONF[@INSTANCE@]=$INSTANCE
-MME_CONF[@PREFIX@]=$PREFIX
-MME_CONF[@REALM@]=$MY_REALM
-MME_CONF[@MME_FQDN@]="mme.${MME_CONF[@REALM@]}"
-MME_CONF[@HSS_HOSTNAME@]='hss'
-MME_CONF[@HSS_FQDN@]="${MME_CONF[@HSS_HOSTNAME@]}.${MME_CONF[@REALM@]}"
-MME_CONF[@HSS_IP_ADDR@]="192.168.61.194"
-
-cp mme_fd.conf.tmplt $PREFIX/mme_fd.conf
-
-for K in "${!MME_CONF[@]}"; do 
-  egrep -lRZ "$K" $PREFIX/mme_fd.conf | xargs -0 -l sed -i -e "s|$K|${MME_CONF[$K]}|g"
-  ret=$?;[[ ret -ne 0 ]] && echo "Tried to replace $K with ${MME_CONF[$K]}"
-done
-
-sed -i -e "s@etc/freeDiameter@etc@" /magma-mme/etc/mme_fd.conf
-sed -i -e "s@bind: 127.0.0.1@bind: 192.168.61.198@" /etc/magma/redis.yml
-# Generate freeDiameter certificate
-popd
-cd /magma-mme/scripts
-./check_mme_s6a_certificate $PREFIX mme.${MME_CONF[@REALM@]}
-
-cd /magma-mme
-nohup /magma-mme/bin/sctpd > /var/log/sctpd.log 2>&1 &
-sleep 5
-/magma-mme/bin/oai_mme -c /magma-mme/etc/mme.conf

ci-scripts/yaml_files/magma_lte_20892/mme.conf

@@ -1,133 +0,0 @@
-# generated by generate_mme_config_script.py
-MME :
-{
-    REALM                                     = "openairinterface.org"
-    PID_DIRECTORY                             = "/var/run";
-    MAXENB                                    = 8;                              # power of 2
-    MAXUE                                     = 16;                             # power of 2
-    RELATIVE_CAPACITY                         = 10;
-
-    EMERGENCY_ATTACH_SUPPORTED                     = "no";
-    UNAUTHENTICATED_IMSI_SUPPORTED                 = "no";
-
-    # EPS network feature support
-    EPS_NETWORK_FEATURE_SUPPORT_IMS_VOICE_OVER_PS_SESSION_IN_S1      = "no";    # DO NOT CHANGE
-    EPS_NETWORK_FEATURE_SUPPORT_EMERGENCY_BEARER_SERVICES_IN_S1_MODE = "no";    # DO NOT CHANGE
-    EPS_NETWORK_FEATURE_SUPPORT_LOCATION_SERVICES_VIA_EPC            = "no";    # DO NOT CHANGE
-    EPS_NETWORK_FEATURE_SUPPORT_EXTENDED_SERVICE_REQUEST             = "no";    # DO NOT CHANGE
-
-    # Display statistics about whole system (expressed in seconds)
-    MME_STATISTIC_TIMER                       = 10;
-    IP_CAPABILITY = "IPV4";                                                   # UE PDN_TYPE
-    USE_STATELESS = "";
-
-    INTERTASK_INTERFACE :
-    {
-        # max queue size per task
-        ITTI_QUEUE_SIZE            = 2000000;
-    };
-
-    S6A :
-    {
-        S6A_CONF                   = "/magma-mme/etc/mme_fd.conf"; # YOUR MME freeDiameter config file path
-        HSS_HOSTNAME               = "hss.openairinterface.org";
-        HSS_REALM                  = "openairinterface.org";
-    };
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 8;
-        SCTP_OUTSTREAMS = 8;
-    };
-
-    # ------- S1AP definitions
-    S1AP :
-    {
-        # outcome drop timer value (seconds)
-        S1AP_OUTCOME_TIMER = 10;
-    };
-
-    # ------- MME served GUMMEIs
-    GUMMEI_LIST = (
-         { MCC="208" ; MNC="92"; MME_GID="32768" ; MME_CODE="3"; }
-    );
-
-    # ------- MME served TAIs
-    TAI_LIST = (
-         {MCC="208" ; MNC="92";  TAC = "1"; }
-    );
-
-    TAC_LIST = (
-         {MCC="208" ; MNC="92";  TAC = "1"; }
-    );
-
-    CSFB :
-    {
-        NON_EPS_SERVICE_CONTROL = "OFF";
-        CSFB_MCC = "208";
-        CSFB_MNC = "92";
-        LAC = "1";
-    };
-    NAS :
-    {
-        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" , "EIA0" ];
-        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
-        T3402                                 =  1                              # in minutes (default is 12 minutes)
-        T3412                                 =  54                             # in minutes (default is 54 minutes, network dependent)
-        T3422                                 =  6                              # in seconds (default is 6s)
-        T3450                                 =  6                              # in seconds (default is 6s)
-        T3460                                 =  6                              # in seconds (default is 6s)
-        T3470                                 =  6                              # in seconds (default is 6s)
-        T3485                                 =  8                              # UNUSED in seconds (default is 8s)
-        T3486                                 =  8                              # UNUSED in seconds (default is 8s)
-        T3489                                 =  4                              # UNUSED in seconds (default is 4s)
-        T3495                                 =  8                              # UNUSED in seconds (default is 8s)
-    };
-
-    SGS :
-    {
-        TS6_1                                 =  10                             # in seconds (default is 10s)
-        TS8                                   =  4                              # in seconds (default is 4s)
-        TS9                                   =  2                              # in seconds (default is 4s)
-        TS10                                   =  4                              # in seconds (default is 4s)
-        TS13                                   =  4                              # in seconds (default is 4s)
-    };
-
-    NETWORK_INTERFACES :
-    {
-        MME_INTERFACE_NAME_FOR_S1_MME         = "eth0";
-        MME_IPV4_ADDRESS_FOR_S1_MME           = "192.168.61.195/24";
-        MME_INTERFACE_NAME_FOR_S11_MME        = "eth0";
-        MME_IPV4_ADDRESS_FOR_S11_MME          = "192.168.61.195/24";
-        MME_PORT_FOR_S11_MME                  = 2123;
-    };
-
-    LOGGING :
-    {
-        OUTPUT            = "CONSOLE";
-        THREAD_SAFE       = "no";
-        COLOR             = "no";
-
-        SCTP_LOG_LEVEL     = "ERROR";
-        GTPV1U_LOG_LEVEL   = "INFO";
-        SPGW_APP_LOG_LEVEL = "INFO";
-        UDP_LOG_LEVEL      = "INFO";
-        S1AP_LOG_LEVEL     = "DEBUG";
-        NAS_LOG_LEVEL      = "INFO";
-        MME_APP_LOG_LEVEL  = "DEBUG";
-        GTPV2C_LOG_LEVEL   = "INFO";
-        S11_LOG_LEVEL      = "DEBUG";
-        S6A_LOG_LEVEL      = "DEBUG";
-        UTIL_LOG_LEVEL     = "INFO";
-        ITTI_LOG_LEVEL     = "ERROR";
-        MME_SCENARIO_PLAYER_LOG_LEVEL = "ERROR";
-        ASN1_VERBOSITY    = "INFO";
-    };
-
-    S-GW :
-   {
-       SGW_IPV4_ADDRESS_FOR_S11              = "192.168.61.196";
-   };
-};

ci-scripts/yaml_files/magma_lte_20892/mme_fd.sprint.conf

@@ -1,169 +0,0 @@
-# -------- Local ---------
-
-# Uncomment if the framework cannot resolv it.
-Identity = "@MME_FQDN@";
-Realm = "@REALM@";
-
-# TLS configuration (see previous section)
-TLS_Cred = "@PREFIX@/freeDiameter/mme.cert.pem",
-           "@PREFIX@/freeDiameter/mme.key.pem";
-TLS_CA   = "@PREFIX@/freeDiameter/mme.cacert.pem";
-
-# Disable use of TCP protocol (only listen and connect in SCTP)
-# Default : TCP enabled
-No_SCTP;
-
-# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
-# Prefer TCP instead of SCTP for establishing new connections.
-# This setting may be overwritten per peer in peer configuration blocs.
-# Default : SCTP is attempted first.
-Prefer_TCP;
-
-
-No_IPv6;
-
-# Overwrite the number of SCTP streams. This value should be kept low, 
-# especially if you are using TLS over SCTP, because it consumes a lot of 
-# resources in that case. See tickets 19 and 27 for some additional details on 
-# this.
-# Limit the number of SCTP streams
-SCTP_streams = 3;
-
-
-# By default, freeDiameter acts as a Diameter Relay Agent by forwarding all 
-# messages it cannot handle locally. This parameter disables this behavior.
-NoRelay;
-
-# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed
-# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the
-# CER/CEA exchange on a dedicated secure port.
-# This parameter only affects outgoing connections.
-# The setting can be also defined per-peer (see Peers configuration section).
-# Default: use RFC6733 method with separate port for TLS.
-
-#TLS_old_method;
-
-AppServThreads = 4;
-
-# Specify the addresses on which to bind the listening server. This must be 
-# specified if the framework is unable to auto-detect these addresses, or if the
-# auto-detected values are incorrect. Note that the list of addresses is sent 
-# in CER or CEA message, so one should pay attention to this parameter if some 
-# adresses should be kept hidden. 
-ListenOn = "@MME_S6A_IP_ADDR@";
-
-Port = 3870;
-SecPort = 5870;
-
-# -------- Extensions ---------
-
-# Uncomment (and create rtd.conf) to specify routing table for this peer.
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_default.fdx" : "rtd.conf";
-
-#LoadExtension = "/usr/local/lib/freeDiameter/_sample.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/app_acct.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/app_diameap.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/app_radgw.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/app_redirect.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/app_sip.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dbg_interactive.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dbg_monitor.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dbg_msg_dumps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dbg_msg_timings.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dbg_rt.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_3gpp2_avps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_CreditControl.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_CxDx.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Gx.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_NAS.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Ro.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Rx.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_S6mS6n.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_SGd.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_SLh.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Sd.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Sh.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_T4.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_T6aT6bT7.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Tsp.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca_3gpp.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_dcca_starent.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_draftload_avps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_eap.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_etsi283034_avps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_legacy_xml.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_mip6a.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_mip6i.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_nas_mipv6.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_nasreq.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4004_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4006bis_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4072_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc4590_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5447_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5580_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5777_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc5778_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc6734_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc6942_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7155_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7683_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_rfc7944_avps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_sip.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29061_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29128_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29154_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29173_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29212_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29214_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29215_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29217_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29229_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29272_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29273_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29329_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29336_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29337_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29338_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29343_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29344_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29345_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29368_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts29468_avps.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_ts32299_avps.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_busypeers.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_default.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_ereg.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_ignore_dh.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_load_balance.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_randomize.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/rt_redirect.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_acct.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_app.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_hss.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_netemul.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_rt_any.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/test_sip.fdx";
-#LoadExtension = "/usr/local/lib/freeDiameter/dict_Rf.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_S6as6d.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_S6t.fdx";
-LoadExtension = "/usr/local/lib/freeDiameter/dict_S6c.fdx";
-
-
-# -------- Peers ---------
-
-# The framework will actively attempt to establish and maintain a connection
-# with the peers listed here.
-# For only accepting incoming connections, see the acl_wl.fx extension.
-
-# ConnectPeer
-# Declare a remote peer to which this peer must maintain a connection. 
-# In addition, this allows specifying non-default parameters for this peer only
-# (for example disable SCTP with this peer, or use RFC3588-flavour TLS). 
-# Note that by default, if a peer is not listed as a ConnectPeer entry, an 
-# incoming connection from this peer will be rejected. If you want to accept 
-# incoming connections from other peers, see the acl_wl.fdx? extension which 
-# allows exactly this. 
-
-ConnectPeer= "@HSS_FQDN@" { ConnectTo = "@HSS_IP_ADDR@"; No_SCTP ; No_IPv6; Prefer_TCP; No_TLS; port = 3868;};

ci-scripts/yaml_files/magma_lte_20892/redis_extern.conf

@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2016-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-# Jinja template for Redis configuration
-# See the default config file for options and explanations:
-# https://github.com/antirez/redis/blob/unstable/redis.conf
-
-# TODO: make sensible, production-aware config decisions
-
-bind 192.168.61.198
-port 6380
-
-daemonize no
-loglevel notice
-
-timeout 0
-databases 1
-
-dbfilename redis_dump.rdb
-dir /data
-
-# Save the DB on disk
-
-save 900 1
-
-save 300 10
-
-save 60 1000

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

@@ -1,68 +0,0 @@
-version: '3.8'
-
-services:
-    gnb_cucp:
-        image: oai-gnb:latest
-        privileged: true
-        container_name: sa-cucp-gnb
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/gnb-cucp.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    gnb_cuup:
-        image: oai-nr-cuup:latest
-        privileged: true
-        container_name: sa-cuup-gnb
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
-        volumes:
-            - ../../conf_files/gnb-cuup.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.196
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c nr-cuup"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    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 --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
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.195
-        #entrypoint: /bin/bash -c "sleep infinity"
-        healthcheck:
-            # pgrep does NOT work
-            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        name: sa-b200-gnb-net
-        ipam:
-            config:
-                - subnet: 192.168.68.192/26
-        driver_opts:
-            com.docker.network.bridge.name: "sa-gnb-net"

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

@@ -6,9 +6,11 @@ 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_B2XX: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cu.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
+            - /dev:/dev
         networks:
             public_net:
                 ipv4_address: 192.168.68.194
@@ -26,7 +28,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 --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 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

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=""
@@ -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
@@ -117,8 +120,6 @@ Options:
    Builds Coverity-Scan objects for upload
 --disable-deadline
    Disables deadline scheduler of Linux kernel (>=3.14.x).
---trace-asn1c-enc-dec
-   Output asn1c logging traces via OAI logging system.
 --enable-deadline
    Enable deadline scheduler of Linux kernel (>=3.14.x). 
 --disable-cpu-affinity
@@ -314,7 +315,7 @@ function main() {
        -P | --phy_simulators)
             SIMUS_PHY=1
             # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
+            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim"
             echo_info "Will compile dlsim, ulsim, ..."
             shift;;
        -s | --check)
@@ -333,6 +334,10 @@ 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"
@@ -411,10 +416,6 @@ function main() {
             sleep 2
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_MEMORY=ON -DSANITIZE_ADDRESS=OFF -DSANITIZE_UNDEFINED=OFF"
             shift;;
-       --trace-asn1c-enc-dec)
-            CMAKE_CMD="$CMAKE_CMD -DTRACE_ASN1C_ENC_DEC=ON"
-            echo_info "Enabling asn1c internal traces via OAI logging system"
-            shift 1;;
         -h | --help)
             print_help
             exit 1;;
@@ -522,7 +523,7 @@ function main() {
     echo_info "Doxygen generation log is located here: $doxygen_log"
     echo_info "Generating Doxygen files....please wait"
     (
-      $CMAKE --build . --target doc
+      cmake3 --build . --target doc
     ) >& $doxygen_log
   fi
 

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
@@ -685,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/addparamset.md

@@ -1,7 +1,7 @@
 The configuration module maps a configuration file section to a `paramdef_t` structure array. One `config_get` call can be used to return the values of all the parameters described in the `paramdef_t` array.
 Retrieving a single occurence of a parameter set ( a group in the libconfig terminology) is just a two steps task:
 1.  describe the parameters in a `paramdef_t` array
-2.  call the `config_get` function
+1.  call the `config_get` function
 
 
 [config_get example](../../config/devusage/addaparam.md)