Add RAN function for LTE MAC

.clang-format

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

.gitignore

@@ -9,11 +9,8 @@ cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/
 
-# IDE files
+# vscode
 .vscode
-.cproject
-.project
-.settings
 
 # Tags for vim/global
 GPATH

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "openair2/E2AP/flexric"]
 	path = openair2/E2AP/flexric
 	url = https://gitlab.eurecom.fr/mosaic5g/flexric.git
-	branch = remotes/origin/service-models-integration
+	branch = rebased-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,61 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
-
-This release improves existing 5G support and adds various new features.
-
-* 5G gNB
-  - Add support for O-RAN 7.2 fronthaul interface
-    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
-  - Add support for 2-layer UL MIMO
-  - FDD interoperability with COTS UE
-  - Compiles on ARM (through SIMDE)
-  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
-  - Add support for E1AP
-  - Add support for multiple DUs and CU-UPs at one CU-CP
-  - FR2 SA with OAI UE
-  - Improve computational efficiency
-* 5G UE
-  - Cleanup in MAC and RRC towards support of 3rd-party gNB
-  - FR2 SA with OAI gNB
-  - Improve computational efficiency
-
-Overall the stability is improved for the same resource usage.
-
-There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
-interoperability is under testing.
-
-This release also includes many fixes and documentation updates.
-
-## [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

@@ -21,7 +21,7 @@
 
 # Author: laurent THOMAS, Lionel GAUTHIER
 
-cmake_minimum_required (VERSION 3.16)
+cmake_minimum_required (VERSION 3.12)
 project (OpenAirInterface LANGUAGES C CXX)
 
 #########################################################
@@ -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,33 +139,20 @@ 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")
 
-# we need -rdynamic to incorporate all symbols in shared objects, see man page
-set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
+set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing")
 # GNU C/C++ Compiler might throw many warnings without packed-bitfield-compat, see man page
+# also, we need -rdynamic to incorporate all symbols in shared objects, again, see man page
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat")
-endif()
-# clang: suppress complaints about unused command line argument (-rdynamic only
-# used during linking)
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
+  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat -rdynamic")
 endif()
 
 set(CMAKE_C_FLAGS
@@ -180,15 +165,24 @@ add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)"
 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")
+  # There seems to be some incompatibility with pthread_create and the RT scheduler, which
+  # results in pthread_create hanging.
+  #
+  # When we switch from Ubuntu 16.04 to 18.04, we found that running with the address sanitizer,
+  # the pthread_create function calls were not working. The inital thought was that we were
+  # trying to create a thread that was not-blocking and would eventually crash the machine during
+  # the run. After more debugging, we found that we would never even start the thread. We narrowed
+  # down the first two instances of pthread_create in the gNB and NR UE to be sctp_eNB_task and
+  # one_thread, respectively. We found that adding sleeps, and various other pauses to the threads
+  # had not effect. From there, we found that if we add an abort(); prior to the thread loop, we
+  # do not execute that. This indicated to us that the problem is not likely to be a non-blocking
+  # thread, but perhaps and issue with pthread_create itself. From there we begain to research the
+  # issue on the web. See: https://github.com/google/sanitizers/issues/1125
+  #
+  # Google searching indicates this appears to be a problem since at least 2018. This could be something
+  # wrong in the pthread library, or something subtly wrong in this CMakeLists.txt. Use Ubuntu 20.04 instead.
 endif ()
 
-add_boolean_option(SANITIZE_THREAD False "enable the address sanitizer (TSan)" ON)
-if (SANITIZE_THREAD)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer -fno-common")
-  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-endif()
-
 add_boolean_option(SANITIZE_UNDEFINED False "enable the undefined behavior sanitizer (UBSan)" ON)
 if (SANITIZE_UNDEFINED)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
@@ -262,13 +256,9 @@ 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(ENABLE_LTTNG        False "Activate the LTTNG 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)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
@@ -277,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(ASN, ...)
+if (DEBUG_ASN1C)
+  add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 # asn1c skeletons need this
 add_definitions(-DHAVE_NETINET_IN_H)
 
@@ -286,14 +282,56 @@ 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}")
+if(E2_AGENT)
+  set(E2AP_DIR ${OPENAIR2_DIR}/E2AP)
+  include_directories ("${E2AP_DIR}")
+  add_library(nr_e2_ran_func
+          ${E2AP_DIR}/RAN_FUNCTION/NR/init_ran_func.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_gtp.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_mac.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_pdcp.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_rlc.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_slice.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/CUSTOMIZED/ran_func_tc.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/O-RAN/ran_func_kpm.c
+          ${E2AP_DIR}/RAN_FUNCTION/NR/O-RAN/ran_func_rc.c
+          # For testing purposes
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_mac.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_rlc.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_pdcp.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_gtp.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_slice.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_tc.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_kpm.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_rc.c
+          ${E2AP_DIR}/flexric/src/util/time_now_us.c
+          )
+  target_link_libraries(nr_e2_ran_func PRIVATE nr_rrc asn1_nr_rrc_hdrs lte_rrc asn1_lte_rrc_hdrs)
 
-set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
-set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
-message(STATUS "Selected KPM Version: ${KPM_VERSION}")
+  add_library(e2_ran_func
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/init_ran_func.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_gtp.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_mac.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_pdcp.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_rlc.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_slice.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/CUSTOMIZED/ran_func_tc.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/O-RAN/ran_func_kpm.c
+          ${E2AP_DIR}/RAN_FUNCTION/LTE/O-RAN/ran_func_rc.c
+          # For testing purposes
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_mac.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_rlc.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_pdcp.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_gtp.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_slice.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_tc.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_kpm.c
+          ${E2AP_DIR}/flexric/test/rnd/fill_rnd_data_rc.c
+          ${E2AP_DIR}/flexric/src/util/time_now_us.c
+          )
+  target_link_libraries(e2_ran_func PRIVATE nr_rrc asn1_nr_rrc_hdrs lte_rrc asn1_lte_rrc_hdrs)
 
+endif()
 
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
@@ -313,6 +351,10 @@ target_link_libraries(lte_rrc PRIVATE nr_rrc)
 add_library(nr_rrc ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c)
 target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)
 
+
+# S1AP and NGAP need crypt library
+pkg_check_modules(libcrypt REQUIRED libcrypt)
+
 # S1AP
 ##############
 set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
@@ -334,6 +376,8 @@ add_library(s1ap
   )
 target_link_libraries(s1ap PUBLIC asn1_s1ap)
 target_link_libraries(s1ap PRIVATE nr_rrc asn1_nr_rrc_hdrs lte_rrc)
+target_include_directories(s1ap PRIVATE ${libcrypt_INCLUDE_DIRS})
+target_link_libraries(s1ap PUBLIC ${libcrypt_LIBRARIES})
 
 # NGAP
 ##############
@@ -355,6 +399,8 @@ add_library(ngap
   )
 target_link_libraries(ngap PUBLIC asn1_ngap)
 target_link_libraries(ngap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_include_directories(ngap PRIVATE ${libcrypt_INCLUDE_DIRS})
+target_link_libraries(ngap PRIVATE ${libcrypt_LIBRARIES})
 
 #M2AP
 ##############
@@ -429,7 +475,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
@@ -447,8 +492,8 @@ add_library(f1ap
             ${F1AP_DIR}/f1ap_handlers.c
             ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
-target_link_libraries(f1ap PUBLIC asn1_f1ap L2_NR)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)
+target_link_libraries(f1ap PUBLIC asn1_f1ap)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc)
 
 # LPP
 ##############
@@ -460,23 +505,19 @@ add_list1_option(NB_ANTENNAS_RX "4" "Number of antennas in reception" "1" "2" "4
 add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
 
 set (CONFIG_ROOTDIR ${OPENAIR_DIR}/common/config)
-add_library(config_internals OBJECT
-  ${CONFIG_ROOTDIR}/config_common.c
-)
-
 add_library(CONFIG_LIB
   ${CONFIG_ROOTDIR}/config_load_configmodule.c
   ${CONFIG_ROOTDIR}/config_userapi.c
   ${CONFIG_ROOTDIR}/config_cmdline.c
 )
-target_link_libraries(CONFIG_LIB PRIVATE config_internals dl UTIL)
 
 # CONFIG_LIB is a wrapper around a particular config implementation, default is
 # libconfig in params_libconfig below
 pkg_check_modules(libconfig REQUIRED libconfig)
+target_link_libraries(CONFIG_LIB PRIVATE dl UTIL)
 add_library(params_libconfig MODULE ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c)
 target_include_directories(params_libconfig PRIVATE ${libconfig_INCLUDE_DIRS})
-target_link_libraries(params_libconfig PRIVATE config_internals ${libconfig_LIBRARIES})
+target_link_libraries(params_libconfig PRIVATE ${libconfig_LIBRARIES})
 
 # shared library loader
 add_library(shlib_loader OBJECT common/utils/load_module_shlib.c)
@@ -484,20 +525,20 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 
 ##########################################################
 
-# LDPC offload library - AMD T2 Accelerator Card
+# LDPC offload library
 ##########################################################
 
-add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
-if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
-  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
+add_boolean_option(ENABLE_LDPC_T1 OFF "Build support for LDPC Offload to T1 library" OFF)
+if (ENABLE_LDPC_T1)
+  pkg_check_modules(LIBDPDK_T1 REQUIRED libdpdk=20.05.0)
+  find_library(T1 NAMES rte_pmd_hpac_sdfec_pmd REQUIRED)
+  if (NOT T1)
+    message(FATAL_ERROR "Library rte_pmd_hpac_sdfec_pmd for T1 offload not found")
   endif()
-  message(STATUS "T2 build: use ${PMD_T2}")
-  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
-  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
+  add_library(ldpc_t1 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_t1 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_compile_options(ldpc_t1 PRIVATE ${LIBDPDK_T1_CFLAGS})
+  target_link_libraries(ldpc_t1 ${LIBDPDK_T1_LDFLAGS} ${T1})
 endif()
 
 ##########################################################
@@ -634,22 +675,17 @@ add_library(HASHTABLE
 include_directories(${OPENAIR_DIR}/common/utils/hashtable)
 
 add_library(UTIL
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
+  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
   ${OPENAIR2_DIR}/UTIL/OPT/probe.c
+  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
+  ${OPENAIR_DIR}/common/utils/utils.c
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/time_meas.c
+  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-if (ENABLE_LTTNG)
-  find_package(LTTngUST 2.3.8 EXACT REQUIRED)
-else()
-  message(STATUS "LTTNG support disabled")
-endif()
-
-pkg_check_modules(cap libcap)
-if (cap_FOUND)
-  # see system.c for more info
-  target_link_libraries(UTIL PRIVATE cap)
-  target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)
-endif()
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)
+target_link_libraries(UTIL PUBLIC ${T_LIB})
 
 set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -712,7 +748,6 @@ 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
@@ -721,16 +756,23 @@ set(SCHED_SRC_NR_UE
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
 target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
+
 # nFAPI
 #################################
+set(NFAPI_COMMON_SRC
+  ${NFAPI_DIR}/common/src/debug.c
+  )
+add_library(NFAPI_COMMON_LIB ${NFAPI_COMMON_SRC})
+
+include_directories(${NFAPI_DIR}/common/public_inc)
+
 set(NFAPI_SRC
+  ${NFAPI_DIR}/nfapi/src/nfapi.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p4.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p5.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p7.c
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
-target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)
 
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -755,10 +797,7 @@ set(NFAPI_VNF_SRC
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
 target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)
-if(OAI_AERIAL)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
-endif()
+
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
 
@@ -788,6 +827,7 @@ set(PHY_POLARSRC
   ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_crc.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -810,30 +850,19 @@ set(PHY_LDPC_ORIG_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
 )
-add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
-target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
 
 set(PHY_LDPC_OPTIM_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
-  )
-add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
-target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
-
+)
 set(PHY_LDPC_OPTIM8SEG_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
 )
-add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
-target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
-
 set(PHY_LDPC_OPTIM8SEGMULTI_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-  )
-add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-
+)
 set(PHY_LDPC_CUDA_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
@@ -847,13 +876,21 @@ add_custom_target( nrLDPC_decoder_kernels_CL
                    COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc
                    SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
 )
+
+set(PHY_NR_CODINGIF
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c;
+)
+
+add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
+target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
+add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
+target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
+add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
+target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
 add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
 target_link_libraries(ldpc_cl OpenCL)
 add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
 
-set(PHY_NR_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
-)
 
 ##############################################
 # Base CUDA setting
@@ -871,9 +908,16 @@ if (ENABLE_LDPC_CUDA)
   endif()
 endif()
 
+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
+
+add_library(ldpc_parityCheck MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_compile_definitions(ldpc_parityCheck PUBLIC NR_LDPC_ENABLE_PARITY_CHECK)
+target_link_libraries(ldpc_parityCheck  PRIVATE ldpc_gen_HEADERS)
+
 add_library(coding MODULE ${PHY_TURBOSRC} )
 
-add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
+add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )
 
 
 set(PHY_SRC_COMMON
@@ -1047,7 +1091,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
@@ -1076,11 +1119,8 @@ 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_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1130,9 +1170,9 @@ if (${SMBV})
 endif  (${SMBV})
 
 set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
 
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
 add_dependencies(PHY_COMMON dfts)
 target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
 
@@ -1153,10 +1193,8 @@ target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common)
 
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
 
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
@@ -1179,9 +1217,10 @@ set(PHY_MEX_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   )
 add_library(PHY_MEX ${PHY_MEX_UE})
-target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs UTIL)
+target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs)
 
 #Layer 2 library
 #####################
@@ -1207,6 +1246,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
@@ -1217,10 +1268,6 @@ set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
-  openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_if.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_direct.c
-  openair2/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
   )
 
 set(NR_SDAP_SRC
@@ -1268,10 +1315,12 @@ set(L2_LTE_SRC
   )
 
 set(L2_NR_SRC
+  ${NR_RLC_SRC}
   ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/nr_rrc_common.c
+  ${NR_RRC_DIR}/L2_nr_interface.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
   ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
   ${NR_RRC_DIR}/nr_rrc_config.c
@@ -1281,8 +1330,6 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_NGAP.c
   ${NR_RRC_DIR}/rrc_gNB_radio_bearers.c
-  ${NR_RRC_DIR}/rrc_gNB_cuup.c
-  ${NR_RRC_DIR}/rrc_gNB_du.c
   )
 
 set(L2_SRC_UE
@@ -1306,6 +1353,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
@@ -1314,7 +1362,6 @@ set(NR_L2_SRC_UE
   ${NR_UE_RRC_DIR}/rrc_UE.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
-  ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
   )
 
 set (MAC_SRC
@@ -1377,15 +1424,13 @@ 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_scheduler_sl.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
 )
 
 set (ENB_APP_SRC
@@ -1426,15 +1471,17 @@ add_library(L2
   )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-
 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_link_libraries(L2 PUBLIC e2_agent e2_ran_func)
+  target_compile_definitions(L2 PRIVATE E2_AGENT)
 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 PUBLIC nr_ue_power_procedures)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1444,24 +1491,27 @@ add_library(L2_NR
   ${MAC_NR_SRC}
   ${GNB_APP_SRC}
   )
-target_link_libraries(L2_NR PRIVATE ds alg)
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
   ${NR_RRC_DIR}/cucp_cuup_e1ap.c
   )
 
-target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)
+target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} crypt e1ap GTPV1U)
 
-target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
-if(OAI_AERIAL)
-    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
-endif()
+add_library(e1_pdcp_if
+  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
+  )
+
+target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap)
 if(E2_AGENT)
-  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_link_libraries(L2_NR PUBLIC e2_agent nr_e2_ran_func)
+  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
 
+
 add_library(L2_LTE_NR
   ${L2_RRC_SRC}
   ${MAC_SRC}
@@ -1490,8 +1540,8 @@ 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 asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures)
+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
             ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1684,7 +1734,7 @@ set(libnas_ies_OBJS
 
 set (libnas_utils_OBJS
   ${NAS_SRC}COMMON/UTIL/device.c
-  common/utils/mem/memory.c
+  ${NAS_SRC}COMMON/UTIL/memory.c
   ${NAS_SRC}COMMON/UTIL/nas_timer.c
   ${NAS_SRC}COMMON/UTIL/socket.c
   ${NAS_SRC}COMMON/UTIL/stty.c
@@ -1884,6 +1934,23 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
+target_link_libraries(SIMU PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
+target_include_directories(SIMU PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
+
+# Qt-based scope
+add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
+if (ENABLE_NRQTSCOPE)
+  find_package(Qt5 REQUIRED COMPONENTS Widgets Charts)
+  message ("Qt5 Widgets and Charts found for nrqtscope")
+  set(QTSCOPE_SOURCE_NR
+    ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp
+    ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c)
+  # Creates rules for calling the Meta-Object Compiler (moc) on the given source files
+  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
+  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
+  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+endif()
 
 add_library(SIMU_ETH STATIC
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
@@ -1908,9 +1975,10 @@ set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODU
 # add executables for operation
 #################################
 add_library(minimal_lib
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   ${OPENAIR_DIR}/common/utils/minimal_stub.c
   )
-target_link_libraries(minimal_lib PUBLIC pthread dl ${T_LIB} LOG)
+target_link_libraries(minimal_lib pthread dl ${T_LIB})
 
 add_executable(nfapi_test
   ${OPENAIR_DIR}/openair2/NR_PHY_INTERFACE/nfapi_5g_test.c
@@ -1953,7 +2021,7 @@ add_dependencies(lte-softmodem oai_iqplayer)
 target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
 
@@ -1962,7 +2030,7 @@ target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 if(E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+  target_compile_definitions(lte-softmodem PRIVATE E2_AGENT)
 endif()
 
 add_executable(oairu
@@ -2013,7 +2081,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
   SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI shlib_loader
   -Wl,--end-group z dl)
 
@@ -2032,6 +2100,7 @@ add_executable(nr-softmodem
   ${rrc_h}
   ${nr_rrc_h}
   ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_DIR}/executables/nr-gnb.c
   ${OPENAIR_DIR}/executables/nr-ru.c
   ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2042,6 +2111,7 @@ add_executable(nr-softmodem
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
@@ -2050,33 +2120,27 @@ target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
   x2ap f1ap m2ap m3ap e1ap shlib_loader
   -Wl,--end-group z dl)
 
 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)
-add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
-if (OAI_AERIAL)
-  target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
-  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
-endif()
-if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
-
 
 add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
 
-if (ENABLE_LDPC_T2)
-  add_dependencies(nr-softmodem ldpc_t2)
+if (ENABLE_LDPC_T1)
+  add_dependencies(nr-softmodem ldpc_t1)
 endif()
 
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
   asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
+if(E2_AGENT)
+  target_compile_definitions(nr-softmodem PRIVATE E2_AGENT)
+endif()
+
 
 add_executable(nr-cuup
   executables/nr-cuup.c
@@ -2090,13 +2154,9 @@ add_executable(nr-cuup
 
 target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap f1ap SIMU_ETH
+                      GTPV1U e1ap e1_pdcp_if f1ap SIMU_ETH
                       z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(E2_AGENT)
-  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
-  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
                      
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2104,6 +2164,7 @@ endif()
 add_executable(nr-uesoftmodem
   ${rrc_h}
   ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
   ${OPENAIR_DIR}/executables/nr-ue.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2113,13 +2174,14 @@ add_executable(nr-uesoftmodem
   ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
   nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
   NFAPI_USER_LIB MISC_NFAPI_NR_LIB
   ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
@@ -2167,6 +2229,7 @@ target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_executable(polartest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(polartest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_COMMON PHY_NR_UE CONFIG_LIB -Wl,--end-group
@@ -2175,6 +2238,7 @@ target_link_libraries(polartest PRIVATE
 
 add_executable(smallblocktest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )
 
 target_link_libraries(smallblocktest PRIVATE
@@ -2188,18 +2252,19 @@ add_executable(ldpctest
    ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
    )
 
-add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
+add_dependencies( ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_parityCheck)
 if (ENABLE_LDPC_CUDA)
   add_dependencies(ldpctest ldpc_cuda)
 endif()
 target_link_libraries(ldpctest PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON -Wl,--end-group
   m pthread dl shlib_loader ${T_LIB}
   )
 
 add_executable(nr_dlschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_dlschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2210,6 +2275,7 @@ target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)
 add_executable(nr_pbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_pbchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2217,26 +2283,12 @@ 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}/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
-  )
-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_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader
-  )
-target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_pucchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2247,6 +2299,7 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
   ${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
@@ -2255,7 +2308,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)
@@ -2263,6 +2316,7 @@ target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_prachsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )
 target_link_libraries(nr_prachsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
@@ -2272,6 +2326,7 @@ target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_ulschsim PRIVATE
@@ -2283,6 +2338,7 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
   ${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
@@ -2291,12 +2347,12 @@ add_executable(nr_ulsim
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
-if (ENABLE_LDPC_T2)
-  add_dependencies(nr_ulsim ldpc_t2)
+if (ENABLE_LDPC_T1)
+  add_dependencies(nr_ulsim ldpc_t1)
 endif()
 
 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
   m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2355,12 +2411,12 @@ if (${T_TRACER})
         params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
         oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
-        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
+        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
-        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
+        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR ngap
         CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc dfts)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()
@@ -2426,6 +2482,9 @@ make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
 # user space tool for configuring MESH IP driver
 ################
 add_executable(rb_tool
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/constant.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/ioctl.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
   ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
@@ -2449,34 +2508,8 @@ 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)
-  find_package(GTest)
-  if (NOT GTest_FOUND)
-    message(STATUS "GTest package not found, will download googletest automatically. To prevent that install google test on your system (libgtest-dev)")
-    include(FetchContent)
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        58d77fa8070e8cec2dc1ed015d66b454c8d78850 # 1.12.1
-    )
-    set(BUILD_GMOCK OFF)
-    set(INSTALL_GTEST OFF)
-    FetchContent_MakeAvailable(googletest)
-    add_library(GTest::gtest ALIAS gtest)
-    add_library(GTest::gtest_main ALIAS gtest_main)
-  endif()
-endif()
-
 add_subdirectory(common)
 add_subdirectory(doc)
-add_subdirectory(nfapi)
 add_subdirectory(openair1)
 add_subdirectory(openair2)
 add_subdirectory(openair3)

CONTRIBUTING.md

@@ -5,26 +5,24 @@ We want to make contributing to this project as easy and transparent as possible
 Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).
 
 1. Sign and return a Contributor License Agreement to OAI team.
-2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
-   if you do not have any.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up) if you do not have any.
    - We recommend that you register with a professional or student email address.
-   - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:contact@openairinterface.org).
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us (mailto:contact@openairinterface.org).
    - Eurecom GitLab does NOT accept public email domains.
-3. Provide the OAI team with the **username** of this account to
-   (mailto:contact@openairinterface.org) ; we will give you the developer
-   rights on this repository.
-4. The contributing policies are described in the [corresponding documentation
-   page](doc/code-style-contrib.md).
-   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account.
-     It just eats up space on our servers.
-   - You can fork onto another hosting system. But we will NOT accept a merge
-     request from a forked repository.
+3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
+4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home).
+   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account. It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge request from a forked repository.
       * 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.
 
-# License #
+## Coding Styles ##
 
-By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under the license described in the file [`LICENSE`](./LICENSE) in the
-root directory of this source tree.
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home).
+
+## License ##
+
+By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.

README.md

@@ -4,16 +4,12 @@
 
 <p align="center">
     <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
     <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
-    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore40-Green" alt="Supported OS Fedora 40"></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>
+    <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">
@@ -25,7 +21,6 @@
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
   <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>
 
 # OpenAirInterface License #
@@ -70,27 +65,10 @@ openairinterface5g
 ├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
 ├── nfapi             : (n)FAPI code for MAC-PHY interface
-├── openair1          : Layer 1 (3GPP LTE Rel-10/12 PHY, NR Rel-15 PHY)
-├── openair2          : Layer 2 (3GPP LTE Rel-10 MAC/RLC/PDCP/RRC/X2AP, LTE Rel-14 M2AP, NR Rel-15+ MAC/RLC/PDCP/SDAP/RRC/X2AP/F1AP/E1AP), E2AP
-├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
 └── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
-
-# How to get support from the OAI Community # 
-
-You can ask your question on the [mailing lists](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/MailingList).
-
-Your email should contain below information:
-
-- A clear subject in your email.
-- For all the queries there should be [Query\] in the subject of the email and for problems there should be [Problem\].
-- In case of a problem, add a small description.
-- Do not share any photos unless you want to share a diagram.
-- OAI gNB/DU/CU/CU-CP/CU-UP configuration file in `.conf` format only.
-- Logs of OAI gNB/DU/CU/CU-CP/CU-UP in `.log` or `.txt` format only.
-- In case your question is related to performance, include a small description of the machine (Operating System, Kernel version, CPU, RAM and networking card) and diagram of your testing environment.
-- Known/open issues are present on [GitLab](https://gitlab.eurecom.fr/oai/openairinterface5g/-/issues), so keep checking.
-
-Always remember a structured email will help us understand your issues quickly.

charts/physims/charts/nr-psbchsim/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-psbchsim
-description: A Helm subchart for nr-psbchsim network function
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-psbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-psbchsim/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-psbchsim.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-psbchsim.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-psbchsim.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-psbchsim.labels" -}}
-helm.sh/chart: {{ include "oai-nr-psbchsim.chart" . }}
-{{ include "oai-nr-psbchsim.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-psbchsim.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-psbchsim.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-psbchsim.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-psbchsim.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-psbchsim/templates/job.yaml

@@ -1,42 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_psbchsim" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName.nrpsbchsim}}
-      nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
-      {{- end }}

charts/physims/charts/nr-psbchsim/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-psbchsim
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-psbchsim"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/values.yaml

@@ -27,14 +27,13 @@ global:
     nrpbschsim106rb: dedale
     nrpbchsim217rb: dedale
     nrpbchsim273rb: dedale
-    nrpsbchsim: dedale
     nrprachsim: dedale
     nrpucchsim: dedale
-    nrulschsim: demophon
-    nrulsim3gpp: demophon
-    nrulsimmimo: demophon
-    nrulsimmisc: demophon
-    nrulsimscfdma: demophon
-    polartest: demophon
-    smallblocktest: demophon
-    ulsim: demophon
+    nrulschsim: theseus
+    nrulsim3gpp: theseus
+    nrulsimmimo: theseus
+    nrulsimmisc: theseus
+    nrulsimscfdma: theseus
+    polartest: theseus
+    smallblocktest: theseus
+    ulsim: theseus

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,32 @@ 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'
+              }
+            }
+          }
+        }
+        stage ("L2-Sim-Test-5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-L2-Sim-Test-5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += l2Sim4GStatus
               }
             }
           }
@@ -312,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
               }
             }
           }
@@ -359,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
               }
             }
           }
@@ -388,15 +334,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                nsaTDDB200Status = finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
+                finalizeSlaveJob('RAN-NSA-B200-Module-LTEBOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += nsaTDDB200Status
               }
             }
           }
@@ -411,15 +354,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saTDDB200Status = finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
+                finalizeSlaveJob('RAN-SA-B200-Module-SABOX-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saTDDB200Status
               }
             }
           }
@@ -434,15 +374,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                phytestLDPCoffloadStatus = finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
+                finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += phytestLDPCoffloadStatus
               }
             }
           }
@@ -457,15 +394,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                lteTDD2x2N3xxStatus = finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += lteTDD2x2N3xxStatus
               }
             }
           }
@@ -480,15 +414,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saAW2SStatus = finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += saAW2SStatus
               }
             }
           }
@@ -503,15 +434,12 @@ pipeline {
           post {
             always {
               script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+                finalizeSlaveJob('RAN-Interop-F1')
               }
             }
             failure {
               script {
                 currentBuild.result = 'FAILURE'
-                failingStages += f1InteropStatus
               }
             }
           }
@@ -526,61 +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
-              }
-            }
-          }
-        }
-        stage ("SA-AERIAL-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-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
-                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saAERIALStatus
-              }
-            }
-          }
-        }
-        stage ("SA-2x2-Module-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-2x2-Module-CN5G', 'SA-2x2-Module-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
-                saTDD2x2Status = finalizeSlaveJob('RAN-SA-2x2-Module-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saTDD2x2Status
               }
             }
           }
@@ -589,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
               }
             }
           }
@@ -622,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 + ")"
@@ -646,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 {
@@ -695,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
@@ -750,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 {
@@ -211,9 +204,7 @@ pipeline {
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                   timeout (time: 60, unit: 'MINUTES') {
                     sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false

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 {
@@ -207,9 +200,7 @@ pipeline {
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                   timeout (time: 60, unit: 'MINUTES') {
                     sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath}"
-                   }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
@@ -229,10 +220,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

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 {
@@ -199,9 +192,7 @@ pipeline {
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                   timeout (time: 60, unit: 'MINUTES') {
                     sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
-                   }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
@@ -221,10 +212,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

ci-scripts/Jenkinsfile-push-registry

@@ -76,7 +76,7 @@ pipeline {
           withCredentials([
             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
           ]) {
-            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
+            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup"]
             // Logging in on both registries
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
             sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"

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 {
@@ -207,9 +200,7 @@ pipeline {
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                     sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false
@@ -304,7 +295,7 @@ pipeline {
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
                         ]) {
                             echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
                             echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
                             sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"

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 {
@@ -203,9 +196,7 @@ pipeline {
                             for (xmlFile in myXmlTestSuite) {
                                 if (fileExists(xmlFile)) {
                                     try {
-                                      timeout (time: 60, unit: 'MINUTES') {
                                         sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                      }
                                     } catch (Exception e) {
                                         currentBuild.result = 'FAILURE'
                                         buildStageStatus = false

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -215,9 +215,7 @@ pipeline {
               for (xmlFile in myXmlTestSuite) {
                 if (fileExists(xmlFile)) {
                   try {
-                   timeout (time: 60, unit: 'MINUTES') {
                     sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --eNB1IPAddress=${params.eNB1_IPAddress} --eNB1UserName=${eNB1_Username} --eNB1Password=${eNB1_Password} --eNB1SourceCodePath=${params.eNB1_SourceCodePath} --eNB2IPAddress=${params.eNB2_IPAddress} --eNB2UserName=${eNB2_Username} --eNB2Password=${eNB2_Password} --eNB2SourceCodePath=${params.eNB2_SourceCodePath} --UEIPAddress=${params.UE_IPAddress} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                   }
                   } catch (Exception e) {
                     currentBuild.result = 'FAILURE'
                     buildStageStatus = false
@@ -274,7 +272,7 @@ pipeline {
                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
             ]) {
               echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
               echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
               sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"

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 {
@@ -193,9 +211,7 @@ pipeline {
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                     sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false

ci-scripts/Jenkinsfile-tmp-ue

@@ -185,9 +185,7 @@ pipeline {
                             for (xmlFile in myXmlTestSuite) {
                             if (fileExists(xmlFile)) {
                                 try {
-                                  timeout (time: 60, unit: 'MINUTES') {
                                     sh "python3 main.py --mode=TestUE --UEIPAddress=${params.UE_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --UEUserName=${UE_Username} --UEPassword=${UE_Password} --UESourceCodePath=${params.UE_SourceCodePath} --XMLTestFile=${xmlFile}"
-                                  }
                                 } catch (Exception e) {
                                     currentBuild.result = 'FAILURE'
                                     buildStageStatus = false

ci-scripts/active_net_interfaces.awk

@@ -18,13 +18,4 @@
 # * For more information about the OpenAirInterface (OAI) Software Alliance:
 # *      contact@openairinterface.org
 # */
-#---------------------------------------------------------------------
-#
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-    name: oai-gnb-fhi72
-    namespace: oaicicd-ran
-spec:
-  lookupPolicy:
-    local: true
+/inet.*brd/{print "interfaceToUse="$NF"done"}

ci-scripts/add_user_to_conf_file.awk

@@ -0,0 +1,33 @@
+BEGIN{lineIdx=0;captureUEDesc=0}
+{
+    if ($0 ~/UE0/) {
+        captureUEDesc = 1
+    }
+    if (captureUEDesc == 1) {
+        captureLine[lineIdx] = $0
+        lineIdx = lineIdx + 1
+    }
+    print $0
+}
+END {
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       print ""
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UE0/) {
+               mLine = captureLine[k]
+               gsub("UE0", "UE"ueIdx, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/MSIN=/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%08d", 1111+int(ueIdx))
+                   gsub("00001111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+
+       }
+   }
+}

ci-scripts/add_user_to_subscriber_list.awk

@@ -0,0 +1,27 @@
+BEGIN{lineIdx=0}
+{
+    captureLine[lineIdx] = $0
+    lineIdx = lineIdx + 1
+    print $0
+}
+END{
+   for (ueIdx = 1; ueIdx < num_ues; ueIdx++) {
+       for (k = 0; k < lineIdx; k++) {
+           if (captureLine[k] ~/UserName=/) {
+               mLine = captureLine[k]
+               MSIN=sprintf("%08d", 1111+int(ueIdx))
+               gsub("00001111", MSIN, mLine)
+               print mLine
+           } else {
+               if (captureLine[k] ~/SubscriptionIndex/) {
+                   mLine = captureLine[k]
+                   MSIN=sprintf("%d", 111+int(ueIdx))
+                   gsub("111", MSIN, mLine)
+                   print mLine
+               } else {
+                   print captureLine[k]
+               }
+           }
+       }
+   }
+}

ci-scripts/as_ue/aw2s-multi-20897.cfg

@@ -4,7 +4,6 @@
  */
 {
 #define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
 #define TDD 1
 
 log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
@@ -17,7 +16,7 @@ include "rf_driver/1chan.cfg",
 
 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
-
+                    
   cell_groups: [{
       group_type: "nr",
       multi_ue: true,
@@ -25,21 +24,21 @@ allow dynamic UE creation from remote API */
       rf_port: 0,
       bandwidth: 20,
       band: 78,
-      dl_nr_arfcn:630048,
-      ssb_nr_arfcn:630048,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
       subcarrier_spacing: 30,
       n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
+      n_antenna_ul: 1,
       rx_to_tx_latency:2,
     }],
   }],
 
   /* UE capabilities */
-  /* USIM data */
+  /* USIM data */     
   ue_list: [
     {
       "ue_id" : 1,
-      "imsi": "001020000000001",
+      "imsi": "208970000000111",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -54,7 +53,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 2,
-      "imsi": "001020000000002",
+      "imsi": "208970000000112",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -69,7 +68,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 3,
-      "imsi": "001020000000003",
+      "imsi": "208970000000113",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -84,7 +83,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 4,
-      "imsi": "001020000000004",
+      "imsi": "208970000000114",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -99,7 +98,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 5,
-      "imsi": "001020000000005",
+      "imsi": "208970000000115",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -114,7 +113,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 6,
-      "imsi": "001020000000006",
+      "imsi": "208970000000116",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -129,7 +128,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 7,
-      "imsi": "001020000000007",
+      "imsi": "208970000000117",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -144,7 +143,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 8,
-      "imsi": "001020000000008",
+      "imsi": "208970000000118",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -159,7 +158,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 9,
-      "imsi": "001020000000009",
+      "imsi": "208970000000119",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -174,7 +173,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 10,
-      "imsi": "001020000000010",
+      "imsi": "208970000000120",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -189,7 +188,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 11,
-      "imsi": "001020000000011",
+      "imsi": "208970000000121",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -204,7 +203,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 12,
-      "imsi": "001020000000012",
+      "imsi": "208970000000122",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -219,7 +218,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 13,
-      "imsi": "001020000000013",
+      "imsi": "208970000000123",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -234,7 +233,7 @@ allow dynamic UE creation from remote API */
     },
         {
       "ue_id" : 14,
-      "imsi": "001020000000014",
+      "imsi": "208970000000124",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -249,7 +248,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 15,
-      "imsi": "001020000000015",
+      "imsi": "208970000000125",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -264,7 +263,7 @@ allow dynamic UE creation from remote API */
     },
     {
       "ue_id" : 16,
-      "imsi": "001020000000016",
+      "imsi": "208970000000126",
       "K": "fec86ba6eb707ed08905757b1bb44b8f",
       "sim_algo":"milenage",
       "op": "1006020f0a478bf6b699f15c062e42b3",

ci-scripts/checkCodingFormattingRules.sh

@@ -74,9 +74,8 @@ then
        IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
        IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
        IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
-       IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FILE || true`
        IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
        then
            if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
            then
@@ -185,9 +184,8 @@ do
             IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
             IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
             IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
-            IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FULLFILE || true`
             IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
             then
                 if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                 then

ci-scripts/ci_infra.yaml

@@ -1,389 +0,0 @@
-idefix:
-  Host: idefix
-  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
-  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-  Trace: True
-  LogStore: /media/usb-drive/ci_qlogs
-
-up2:
-  Host: up2
-  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
-sphex_quectel:
-  Host: sphex
-  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
-  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 detach
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-  LogStore: /media/ci_qlogs
-
-adb_ue_1:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate R3CM40LZPHT
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach R3CM40LZPHT
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach R3CM40LZPHT
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT
-  DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable"
-  DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable"
-  NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
-  CmdPrefix: adb -s R3CM40LZPHT shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_1-logs
-adb_ue_2:
-  Host: nano
-  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
-  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
-  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
-  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
-  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
-  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
-  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
-  NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
-  CmdPrefix: adb -s 5200c00db4413517 shell
-  MTU: 1500
-  LogStore: /media/usb-drive/ci_adb_2-logs
-
-oc-cn5g:
-  Host: avra
-  NetworkScript: echo "inet 172.21.6.102"
-  RunIperf3Server: False
-
-matix-cn5g:
-  Host: matix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-porcepix-cn4g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-porcepix-cn5g:
-  Host: porcepix
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-  RunIperf3Server: False
-
-nano-cn4g:
-  Host: nano
-  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec prod-trf-gen
-
-ltebox-nano:
-  Host: nano
-  NetworkScript: ip a show dev tun1
-
-sabox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-ltebox-nepes:
-  Host: nepes
-  NetworkScript: ip a show dev tun1
-
-amarisoft_ue:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_1:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue1
-  MTU: 1500
-amarisoft_ue_2:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
-  NetworkScript: ip netns exec ue2 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue2
-  MTU: 1500
-amarisoft_ue_3:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
-  NetworkScript: ip netns exec ue3 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue3
-  MTU: 1500
-amarisoft_ue_4:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
-  NetworkScript: ip netns exec ue4 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue4
-  MTU: 1500
-amarisoft_ue_5:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
-  NetworkScript: ip netns exec ue5 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue5
-  MTU: 1500
-amarisoft_ue_6:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
-  NetworkScript: ip netns exec ue6 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue6
-  MTU: 1500
-amarisoft_ue_7:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
-  NetworkScript: ip netns exec ue7 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue7
-  MTU: 1500
-amarisoft_ue_8:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
-  NetworkScript: ip netns exec ue8 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue8
-  MTU: 1500
-amarisoft_ue_9:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
-  NetworkScript: ip netns exec ue9 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue9
-  MTU: 1500
-amarisoft_ue_10:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
-  NetworkScript: ip netns exec ue10 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue10
-  MTU: 1500
-amarisoft_ue_11:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
-  NetworkScript: ip netns exec ue11 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue11
-  MTU: 1500
-amarisoft_ue_12:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
-  NetworkScript: ip netns exec ue12 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue12
-  MTU: 1500
-amarisoft_ue_13:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
-  NetworkScript: ip netns exec ue13 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue13
-  MTU: 1500
-amarisoft_ue_14:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
-  NetworkScript: ip netns exec ue14 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue14
-  MTU: 1500
-amarisoft_ue_15:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
-  NetworkScript: ip netns exec ue15 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue15
-  MTU: 1500
-amarisoft_ue_16:
-  Host: amariue
-  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
-  NetworkScript: ip netns exec ue16 ip a show dev pdn0
-  CmdPrefix: ip netns exec ue16
-  MTU: 1500
-
-oai_ue_caracal:
-  Host: caracal
-  AttachScript: 'docker start oai-nr-ue'
-  DetachScript: 'docker stop oai-nr-ue'
-  NetworkScript: ip a show dev oaitun_ue1
-  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
-  CmdPrefix: docker exec rfsim5g-oai-gnb
-  IF: oaitun_enb1
-
-rfsim5g_ue:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
-
-rfsim5g_ue2:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue2 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue2
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue2
-  DetachScript: docker stop rfsim5g-oai-nr-ue2
-  MTU: 1500
-
-rfsim5g_ue3:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue3 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue3
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue3
-  DetachScript: docker stop rfsim5g-oai-nr-ue3
-  MTU: 1500
-
-rfsim5g_ue4:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue4 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue4
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue4
-  DetachScript: docker stop rfsim5g-oai-nr-ue4
-  MTU: 1500
-
-rfsim5g_ue5:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue5 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue5
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue5
-  DetachScript: docker stop rfsim5g-oai-nr-ue5
-  MTU: 1500
-
-rfsim5g_ue6:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue6 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue6
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue6
-  DetachScript: docker stop rfsim5g-oai-nr-ue6
-  MTU: 1500
-
-rfsim5g_ue7:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue7 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue7
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue7
-  DetachScript: docker stop rfsim5g-oai-nr-ue7
-  MTU: 1500
-
-rfsim5g_ue8:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue8 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue8
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue8
-  DetachScript: docker stop rfsim5g-oai-nr-ue8
-  MTU: 1500
-
-rfsim5g_ue9:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue9 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue9
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue9
-  DetachScript: docker stop rfsim5g-oai-nr-ue9
-  MTU: 1500
-
-rfsim5g_ue10:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-nr-ue10 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue10
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue10
-  DetachScript: docker stop rfsim5g-oai-nr-ue10
-  MTU: 1500
-
-rfsim5g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec rfsim5g-oai-ext-dn
-
-rfsim4g_ue:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim4g-oai-lte-ue0
-  DetachScript: docker stop rfsim4g-oai-lte-ue0
-  MTU: 1500
-
-rfsim4g_ext_dn:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec rfsim4g-trf-gen
-
-rfsim4g_enb_nos1:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enb1
-
-rfsim4g_enb_fembms:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enm1
-  CmdPrefix: docker exec rfsim4g-oai-enb
-  IF: oaitun_enm1
-
-rfsim4g_ue_fembms:
-  Host: localhost
-  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_uem1
-  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
-  IF: oaitun_uem1
-
-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
-  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec l2sim-oai-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
-  NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
-  CmdPrefix: docker exec l2sim4g-trf-gen

ci-scripts/ci_ueinfra.yaml

@@ -0,0 +1,187 @@
+idefix:
+  Host: idefix
+  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quectel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  NetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  Trace: True
+  LogStore: /media/usb-drive/ci_qlogs
+nrmodule2_quectel:
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  NetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+  LogStore: /media/ci_qlogs
+
+adb_ue_1:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize R3CM40LZPHT
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate R3CM40LZPHT
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach R3CM40LZPHT
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach R3CM40LZPHT
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check R3CM40LZPHT
+  DataEnableScript: adb -s R3CM40LZPHT shell "svc data enable"
+  DataDisableScript: adb -s R3CM40LZPHT shell "svc data disable"
+  NetworkScript: adb -s R3CM40LZPHT shell "ip address show | grep rmnet_data0"
+  CmdPrefix: adb -s R3CM40LZPHT shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_1-logs
+adb_ue_2:
+  Host: nano
+  InitScript: /home/oaicicd/ci_ctl_adb.sh initialize 5200c00db4413517
+  TermScript: /home/oaicicd/ci_ctl_adb.sh terminate 5200c00db4413517
+  AttachScript: /home/oaicicd/ci_ctl_adb.sh attach 5200c00db4413517
+  DetachScript: /home/oaicicd/ci_ctl_adb.sh detach 5200c00db4413517
+  CheckStatusScript: /home/oaicicd/ci_ctl_adb.sh check 5200c00db4413517
+  DataEnableScript: adb -s 5200c00db4413517 shell "svc data enable"
+  DataDisableScript: adb -s 5200c00db4413517 shell "svc data disable"
+  NetworkScript: adb -s 5200c00db4413517 shell "ip address show | grep rmnet"
+  CmdPrefix: adb -s 5200c00db4413517 shell
+  MTU: 1500
+  LogStore: /media/usb-drive/ci_adb_2-logs
+
+amarisoft_ue:
+  Host: amariue
+  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/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/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/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/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/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/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/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/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/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/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
+
+oai_ue_caracal:
+  Host: caracal
+  AttachScript: 'docker start oai-nr-ue'
+  DetachScript: 'docker stop oai-nr-ue'
+  NetworkScript: ip a show dev oaitun_ue1
+  IF: oaitun_ue1
+  MTU: 1500
+
+rfsim5g_gnb_nos1:
+  Host: localhost
+  NetworkScript: docker exec rfsim5g-oai-gnb ip a show dev oaitun_enb1
+  CmdPrefix: docker exec rfsim5g-oai-gnb
+  IF: oaitun_enb1
+
+rfsim5g_ue:
+  Host: localhost
+  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
+  CmdPrefix: docker exec rfsim5g-oai-nr-ue
+  IF: oaitun_ue1
+
+rfsim5g_ext_dn:
+  Host: localhost
+  NetworkScript: docker exec rfsim5g-oai-ext-dn ip a show dev eth0
+  CmdPrefix: docker exec rfsim5g-oai-ext-dn
+
+rfsim4g_ue:
+  Host: localhost
+  NetworkScript: docker exec rfsim4g-oai-lte-ue0 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
+  IF: oaitun_ue1
+
+rfsim4g_ext_dn:
+  Host: localhost
+  NetworkScript: docker exec rfsim4g-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec rfsim4g-trf-gen
+
+rfsim4g_enb_nos1:
+  Host: localhost
+  NetworkScript: docker exec rfsim4g-oai-enb ip a show dev oaitun_enb1
+  CmdPrefix: docker exec rfsim4g-oai-enb
+  IF: oaitun_enb1
+
+l2sim5g_ue:
+  Host: localhost
+  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec l2sim-oai-nr-ue0
+  IF: oaitun_ue1
+
+l2sim5g_ext_dn:
+  Host: localhost
+  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
+  CmdPrefix: docker exec l2sim-oai-ext-dn
+
+l2sim4g_ue:
+  Host: localhost
+  NetworkScript: docker exec l2sim4g-oai-lte-ue1 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec l2sim4g-oai-lte-ue1
+  IF: oaitun_ue1
+
+l2sim4g_ext_dn:
+  Host: localhost
+  NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
+  CmdPrefix: docker exec l2sim4g-trf-gen

ci-scripts/cls_cluster.py

@@ -44,9 +44,6 @@ OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
 CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
-CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
-
 
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -68,51 +65,6 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
-def OC_deploy_CN(cmd, ocUserName, ocPassword):
-	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
-	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
-	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
-	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Deployment failed')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
-def OC_undeploy_CN(cmd, ocUserName, ocPassword):
-	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
-	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
-	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
-	if not succeeded:
-		return False, CONST.OC_LOGIN_FAIL
-	cmd.run(f'rm -Rf {path}/logs')
-	cmd.run(f'mkdir -p {path}/logs')
-	logging.debug('OC OAI CN5G: Collecting log files to workspace')
-	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
-	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
-	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
-		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-		if not podName:
-			logging.debug(f'{ii} pod not found!')
-		else:
-			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
-	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
-	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
-	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
-	if ret.returncode != 0:
-		logging.error('OC OAI CN5G: Undeployment failed')
-		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
-		OC_logout(cmd)
-		return False, CONST.OC_PROJECT_FAIL
-	report = cmd.run('oc get pods')
-	OC_logout(cmd)
-	return True, report
-
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""
@@ -180,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -314,19 +266,13 @@ 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)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
@@ -462,38 +408,11 @@ class Cluster:
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
-		if status:
-			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
-			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
-			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
-			attemptedImages += ['ran-build-fhi72']
-
-			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job')
-			status = status and wait
-			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
-		if status:
-			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
-			self._recreate_bc('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
-			attemptedImages += ['oai-gnb-fhi72']
-
-			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
-			if not wait: logging.error('error during build of gNB-fhi72')
-			status = status and wait
-			# recover logs
-			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
 		# split and analyze logs
 		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_cmd.py

@@ -31,8 +31,7 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import sys
-import time
+import sys 
 
 SSHTIMEOUT=7
 
@@ -87,12 +86,6 @@ class Cmd(metaclass=abc.ABCMeta):
 		return
 
 class LocalCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
@@ -107,7 +100,6 @@ class LocalCmd(Cmd):
 				# if we wait for stdout, subprocess does not return before the end of the command
 				# however, we don't want to wait for commands with &, so just return fake command
 				ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
-				time.sleep(0.1)
 			else:
 				ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
 		except Exception as e:
@@ -130,40 +122,12 @@ class LocalCmd(Cmd):
 		if src[0] != '/' or tgt[0] != '/':
 			raise Exception('support only absolute file paths!')
 		opt = '-r' if recursive else ''
-		return self.run(f'cp {opt} {src} {tgt}').returncode == 0
+		self.run(f'cp {opt} {src} {tgt}')
 
 	def copyout(self, src, tgt, recursive=False):
-		return self.copyin(src, tgt, recursive)
-
-def PutFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.put(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while putting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
-
-def GetFile(client, src, tgt):
-	success = True
-	sftp = client.open_sftp()
-	try:
-		sftp.get(src, tgt)
-	except FileNotFoundError as error:
-		logging.error(f"error while getting {src}: {error}")
-		success = False
-	sftp.close()
-	return success
+		self.copyin(src, tgt, recursive)
 
 class RemoteCmd(Cmd):
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_value, exc_traceback):
-		self.close()
-
 	def __init__(self, hostname, d=None):
 		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
@@ -212,7 +176,6 @@ class RemoteCmd(Cmd):
 				# however, we don't want to wait for commands with &, so just return fake command
 				self.client.exec_command(line, timeout = 5)
 				ret = sp.CompletedProcess(args=line, returncode=0, stdout=b'')
-				time.sleep(0.1)
 			else:
 				stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
 				ret = sp.CompletedProcess(args=line, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
@@ -230,38 +193,36 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			with LocalCmd() as cmd:
-				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-					return False
-				if not PutFile(self.client, abstmpfile, abstmpfile):
-					return False
-				cmd.run(f"rm {abstmpfile}")
-				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.put(abstmpfile, abstmpfile)
+			sftp.close()
+			cmd.run(f"rm {abstmpfile}")
+			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return PutFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.put(src, tgt)
+			sftp.close()
 
-	# if recursive is True, tgt must be a directory (and src is file or directory)
-	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
-				return False
-			if not GetFile(self.client, abstmpfile, abstmpfile):
-				return False
+			self.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.get(abstmpfile, abstmpfile)
+			sftp.close()
 			self.run(f"rm {abstmpfile}")
-			with LocalCmd() as cmd:
-				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
-				return ret.returncode == 0
+			cmd = LocalCmd()
+			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
 		else:
-			return GetFile(self.client, src, tgt)
+			sftp = self.client.open_sftp()
+			sftp.get(src, tgt)
+			sftp.close()

ci-scripts/cls_containerize.py

@@ -53,13 +53,10 @@ import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
-
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
-
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
 		logging.error('need ranCommitID in CreateWorkspace()')
@@ -97,9 +94,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 +150,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
@@ -169,27 +168,97 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
-# pyshark livecapture launches 2 processes:
-# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
-# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
-# but in fact the packets are read by the following loop before being in fact
-# really written to loFile.
-# So it is mandatory to keep the loop
-def LaunchPySharkCapture(lIfs, lFilter, loFile):
-	capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
-	for packet in capture.sniff_continuously():
-		pass
+def AnalyzeIperf(cliOptions, clientReport, serverReport):
+	req_bw = 1.0 # default iperf throughput, in Mbps
+	result = re.search('-b *(?P<iperf_bandwidth>[0-9\.]+)(?P<magnitude>[kKMG])', cliOptions)
+	if result is not None:
+		req_bw = float(result.group('iperf_bandwidth'))
+		magn = result.group('magnitude')
+		if magn == "k" or magn == "K":
+			req_bw /= 1000
+		elif magn == "G":
+			req_bw *= 1000
+	req_dur = 10 # default iperf send duration
+	result = re.search('-t *(?P<duration>[0-9]+)', cliOptions)
+	if result is not None:
+		req_dur = int(result.group('duration'))
+
+	reportLine = None
+	# find server report in client status
+	clientReportLines = clientReport.split('\n')
+	for l in range(len(clientReportLines)):
+		res = re.search('read failed: Connection refused', clientReportLines[l])
+		if res is not None:
+			message = 'iperf connection refused by server!'
+			logging.error(f'\u001B[1;37;41mIperf Test FAIL: {message}\u001B[0m')
+			return (False, message)
+		res = re.search('Server Report:', clientReportLines[l])
+		if res is not None and l + 1 < len(clientReportLines):
+			reportLine = clientReportLines[l+1]
+			logging.debug(f'found server report: "{reportLine}"')
+
+	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+	# if we do not find a server report in the client logs, check the server logs
+	# and use the last line which is typically close/identical to server report
+	if reportLine is None:
+		for l in serverReport.split('\n'):
+			res = re.search(statusTemplate, l)
+			if res is not None:
+				reportLine = l
+		if reportLine is None:
+			logging.warning('no report in server status found!')
+			return (False, 'could not parse iperf logs')
+		logging.debug(f'found client status: {reportLine}')
+
+	result = re.search(statusTemplate, reportLine)
+	if result is None:
+		logging.error('could not analyze report from statusTemplate')
+		return (False, 'could not parse iperf logs')
+
+	duration = float(result.group('duration'))
+	bitrate = float(result.group('bitrate'))
+	magn = result.group('magnitude')
+	if magn == "k" or magn == "K":
+		bitrate /= 1000
+	elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+		bitrate *= 1000
+	jitter = float(result.group('jitter'))
+	packetloss = float(result.group('packetloss'))
+
+	logging.debug('\u001B[1;37;44m iperf result \u001B[0m')
+	msg = f'Req Bitrate: {req_bw}'
+	logging.debug(f'\u001B[1;34m{msg}\u001B[0m')
+
+	br_loss = bitrate/req_bw
+	bmsg = f'Bitrate    : {bitrate} (perf {br_loss})'
+	logging.debug(f'\u001B[1;34m{bmsg}\u001B[0m')
+	msg += '\n' + bmsg
+	if br_loss < 0.9:
+		msg += '\nBitrate performance too low (<90%)'
+		logging.debug(f'\u001B[1;37;41mBitrate performance too low (<90%)\u001B[0m')
+		return (False, msg)
+
+	plmsg = f'Packet Loss: {packetloss}%'
+	logging.debug(f'\u001B[1;34m{plmsg}\u001B[0m')
+	msg += '\n' + plmsg
+	if packetloss > 5.0:
+		msg += '\nPacket Loss too high!'
+		logging.debug(f'\u001B[1;37;41mPacket Loss too high \u001B[0m')
+		return (False, msg)
+
+	dmsg = f'Duration   : {duration} (req {req_dur})'
+	logging.debug(f'\u001B[1;34m{dmsg}\u001B[0m')
+	msg += '\n' + dmsg
+	if duration < float(req_dur):
+		msg += '\nDuration of iperf too short!'
+		logging.debug(f'\u001B[1;37;41mDuration of iperf too short\u001B[0m')
+		return (False, msg)
+
+	jmsg = f'Jitter     : {jitter}'
+	logging.debug(f'\u001B[1;34m{jmsg}\u001B[0m')
+	msg += '\n' + jmsg
+	return (True, msg)
 
-def StopPySharkCapture(testcase):
-	with cls_cmd.LocalCmd() as myCmd:
-		cmd = 'killall tshark'
-		myCmd.run(cmd, reportNonZero=False)
-		cmd = 'killall dumpcap'
-		myCmd.run(cmd, reportNonZero=False)
-		time.sleep(5)
-		cmd = f'mv /tmp/capture_{testcase}.pcap ../cmake_targets/log/{testcase}/.'
-		myCmd.run(cmd, timeout=100, reportNonZero=False)
-	return False
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -219,7 +288,6 @@ class Containerize():
 		self.proxyCommit = None
 		self.eNB_instance = 0
 		self.eNB_serverId = ['', '', '']
-		self.deployKind = [True, True, True]
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.nb_healthy = [0, 0, 0]
@@ -286,44 +354,35 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu22'
-			self.cliBuildOptions = ''
+			self.dockerfileprefix = '.ubuntu20'
+			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--disable-compression'
+			self.cliBuildOptions = '--no-cache --disable-compression'
 
 		# we always build the ran-build image with all targets
-		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
-		imageNames = [('ran-build', 'build', 'ran-build', '')]
+		imageNames = [('ran-build', 'build')]
 		result = re.search('eNB', self.imageKind)
+		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
 		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-		result = re.search('gNB', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('all', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
-			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			if self.host == 'Red Hat':
-				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
-			if self.host == 'Ubuntu':
-				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
-				# Building again the 5G images with Address Sanitizer
-				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
-				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
-		result = re.search('build_cross_arm64', self.imageKind)
-		if result is not None:
-			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+			imageNames.append(('oai-enb', 'eNB'))
+		else:
+			result = re.search('gNB', self.imageKind)
+			if result is not None:
+				imageNames.append(('oai-gnb', 'gNB'))
+			else:
+				result = re.search('all', self.imageKind)
+				if result is not None:
+					imageNames.append(('oai-enb', 'eNB'))
+					imageNames.append(('oai-gnb', 'gNB'))
+					imageNames.append(('oai-nr-cuup', 'nr-cuup'))
+					imageNames.append(('oai-lte-ue', 'lteUE'))
+					imageNames.append(('oai-nr-ue', 'nrUE'))
+					if self.host == 'Red Hat':
+						imageNames.append(('oai-physim', 'phySim'))
+					if self.host == 'Ubuntu':
+						imageNames.append(('oai-lte-ru', 'lteRU'))
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -352,23 +411,19 @@ class Containerize():
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			forceBaseImageBuild = True
 
 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
-		for image,pattern,name,option in imageNames:
-			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
+		if forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+		for image,pattern in imageNames:
+			cmd.run(f"{self.cli} image rm {image}:{imageTag}")
 
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
@@ -376,13 +431,13 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
+			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
 			cmd.run(f"{self.cli} image prune --force")
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -402,63 +457,45 @@ class Containerize():
 		# Build the target image(s)
 		status = True
 		attemptedImages = ['ran-base']
-		for image,pattern,name,option in imageNames:
-			attemptedImages += [name]
+		for image,pattern in imageNames:
+			attemptedImages += [image]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			# target images should use the proper ran-build image
-			if image != 'ran-build' and "-asan" in name:
-				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name:
-				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif image != 'ran-build':
+			if image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')
-			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
-			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')
-			if image == 'ran-build' and ret.returncode == 0:
-				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
-				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
-				cmd.run(f"docker rm -f test-log")
-			else:
-				cmd.run(f"mkdir -p cmake_targets/log/{name}")
+			cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', timeout=1200)
+			# split the log
+			cmd.run(f"mkdir -p cmake_targets/log/{image}")
+			cmd.run(f"python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log")
 			# check the status of the build
-			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
+			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {image}:{imageTag}")
 			if ret.returncode != 0:
-				logging.error('\u001B[1m Could not build properly ' + name + '\u001B[0m')
+				logging.error('\u001B[1m Could not build properly ' + image + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
-				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
-				allImagesSize[name] = 'N/A -- Build Failed'
+				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
+				allImagesSize[image] = 'N/A -- Build Failed'
 				break
 			else:
 				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 				if result is not None:
 					size = float(result.group("size")) / 1000000 # convert to MB
 					imageSizeStr = f'{size:.1f}'
-					logging.debug(f'\u001B[1m   {name} size is {imageSizeStr} Mbytes\u001B[0m')
-					allImagesSize[name] = f'{imageSizeStr} Mbytes'
+					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
+					allImagesSize[image] = f'{imageSizeStr} Mbytes'
 				else:
-					logging.debug(f'{name} size is unknown')
-					allImagesSize[name] = 'unknown'
+					logging.debug(f'{image} size is unknown')
+					allImagesSize[image] = 'unknown'
 			# Now pruning dangling images in between target builds
 			cmd.run(f"{self.cli} image prune --force")
 
 		# Remove all intermediate build images and clean up
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
+		if self.ranAllowMerge and forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
 
-		# Remove some cached artifacts to prevent out of diskspace problem
-		logging.debug(cmd.run("df -h").stdout)
-		logging.debug(cmd.run("docker system df").stdout)
-		cmd.run(f"{self.cli} buildx prune --filter until=1h --force")
-		logging.debug(cmd.run("df -h").stdout)
-		logging.debug(cmd.run("docker system df").stdout)
-
 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -471,13 +508,12 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)
 
 	def BuildProxy(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -518,7 +554,7 @@ class Containerize():
 			sys.exit(1)
 
 		self.cli = 'docker'
-		self.cliBuildOptions = ''
+		self.cliBuildOptions = '--no-cache'
 
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -560,7 +596,7 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
-				return False
+				sys.exit(1)
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
 
@@ -605,109 +641,22 @@ class Containerize():
 		collectInfo['proxy'] = files
 		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
 		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
-
 		allImagesSize = {}
 		if result is not None:
 			imageSize = float(result.group('size')) / 1000000
 			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
 			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
-			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
-			logging.error('proxy size is unknown')
+			logging.debug('proxy size is unknown')
 			allImagesSize['proxy'] = 'unknown'
-			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
 
-	def BuildRunTests(self, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.RemoteCmd(lIpAddr)
-		cmd.cd(lSourcePath)
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
 
-		ret = cmd.run('hostnamectl')
-		result = re.search('Ubuntu', ret.stdout)
-		host = result.group(0)
-		if host != 'Ubuntu':
-			cmd.close()
-			raise Exception("Can build unit tests only on Ubuntu server")
-		logging.debug('running on Ubuntu as expected')
-
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-		self.testCase_id = HTML.testCase_id
-	
-		# check that ran-base image exists as we expect it
-		baseImage = 'ran-base'
-		baseTag = 'develop'
-		if self.ranAllowMerge:
-			if self.ranTargetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
-				result = re.search('index', cmd.getBefore())
-				if result is not None:
-					baseTag = 'ci-temp'
-		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
-		if ret.returncode != 0:
-			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu22"
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
-		if ret.returncode != 0:
-			build_log_name = f'build_log_{self.testCase_id}'
-			CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
-			logging.error(f'Cannot build unit tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
-
-		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:{baseTag}')
-		build_log_name = f'build_log_{self.testCase_id}'
-		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
-		cmd.close()
-
-		if ret.returncode == 0:
-			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
-			HTML.CreateHtmlTabFooter(True)
-			return True
-		else:
-			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
-			HTML.CreateHtmlTabFooter(False)
-			return False
+		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
@@ -743,11 +692,10 @@ class Containerize():
 		orgTag = 'develop'
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
-			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
-				continue
 			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
@@ -791,7 +739,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}')
@@ -853,7 +800,8 @@ class Containerize():
 			logging.debug('Removing test images locally')
 			myCmd = cls_cmd.LocalCmd()
 
-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup', 'oai-gnb-aw2s']
+		for image in imageNames:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			cmd = f'docker rmi oai-ci/{imageTag}'
 			myCmd.run(cmd, reportNonZero=False)
@@ -882,7 +830,6 @@ class Containerize():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		self.deployKind[self.eNB_instance] = True
 
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -891,19 +838,24 @@ class Containerize():
 
 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
 		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
-		for image in IMAGES:
+		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']
+		for image in imagesList:
 			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
+		localMmeIpAddr = EPC.MmeIPAddress
+		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)
 
 		# Currently support only one
 		svcName = self.services[self.eNB_instance]
 		if svcName == '':
 			logging.warning('no service name given: starting all services in ci-docker-compose.yml!')
 
-		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
+		mySSH.command(f'docker-compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
 
 		# Checking Status
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5)
+		grep = ''
+		if svcName != '': grep = f' | grep -A3 {svcName}'
+		mySSH.command(f'docker-compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
@@ -951,8 +903,8 @@ class Containerize():
 		if healthyNb == 1:
 			cnt = 0
 			while (cnt < 20):
-				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting|ready"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured|cuPHYController initialized|Received CONFIG.response, gNB is ready', mySSH.getBefore())
+				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
+				result = re.search('got sync|Starting F1AP at CU|Got sync', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -960,6 +912,7 @@ class Containerize():
 					cnt = 100
 					status = True
 					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
+					time.sleep(10)
 		else:
 			# containers are unhealthy, so we won't start. However, logs are stored at the end
 			# in UndeployObject so we here store the logs of the unhealthy container to report it
@@ -1004,87 +957,87 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
-		mySSH = cls_cmd.getConnection(lIpAddr)
-		yamlDir = f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}'
-		mySSH.run(f'cd {yamlDir}')
+		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
+		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
+
 		svcName = self.services[self.eNB_instance]
 		forceDown = False
 		if svcName != '':
 			logging.warning(f'service name given, but will stop all services in ci-docker-compose.yml!')
 			svcName = ''
 
-		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
-		if ret.returncode != 0:
-			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services")
-			self.exitStatus = 1
-			return
+		mySSH.command(f'docker-compose -f ci-docker-compose.yml config --services', '\$', 5)
 		# first line has command, last line has next command prompt
-		allServices = ret.stdout.splitlines()
+		allServices = mySSH.getBefore().split('\r\n')[1:-1]
 		services = []
 		for s in allServices:
-			# outputs the hash if the container is running
-			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
-			c = ret.stdout
-			logging.debug(f'running service {s} with container id {c}')
-			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
-				services.append((s, c))
-		logging.info(f'stopping services {[s for s, _ in services]}')
+			mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
+			running = mySSH.getBefore().split('\r\n')[2:-1]
+			logging.debug(f'running services: {running}')
+			if len(running) > 0: # something is running for that service
+				services.append(s)
+		logging.info(f'stopping services {services}')
 
-		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
-		copyin_res = True
-		for service_name, container_id in services:
+		mySSH.command(f'docker-compose -f ci-docker-compose.yml stop -t3', '\$', 30)
+		time.sleep(5)  # give some time to running containers to stop
+		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
-			filename = f'{service_name}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker logs {container_id} &> {lSourcePath}/cmake_targets/log/{filename}')
-			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
+			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.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')
+		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!
-		if not copyin_res:
-			HTML.htmleNBFailureMsg='Could not copy logfile(s) to analyze it!'
+		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
+		if len(services) > 1:
+			files = '{' + files + '}'
+		copyin_res = 0
+		if len(services) > 0:
+			copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, f'{lSourcePath}/cmake_targets/log/{files}.log', '.')
+		if copyin_res == -1:
+			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
 			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 any(service_name == 'oai-nr-ue' or service_name == 'lte_ue0' for service_name, _ in services):
+                # use function for UE log analysis, when oai-nr-ue container is used
+		elif 'oai-nr-ue' in services:
 			self.exitStatus == 0
-			logging.debug(f'Analyzing UE logfile {filename}')
+			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
 			if (logStatus < 0):
+				fullStatus = False
 				HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
-				self.exitStatus = 1
 			else:
 				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
-			for service_name, _ in services:
-				if service_name == 'nv-cubb':
-					msg = 'Undeploy PNF/Nvidia CUBB'
-					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
+			for svcName in services:
+				filename = f'{svcName}-{HTML.testCase_id}.log'
+				logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
+				logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+				if (logStatus < 0):
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
+					self.exitStatus = 1
 				else:
-					filename = f'{service_name}-{HTML.testCase_id}.log'
-					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
-					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
-					if (logStatus < 0):
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-						self.exitStatus = 1
-					else:
-						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			# all the xNB run logs shall be on the server 0 for logCollecting
 			if self.eNB_serverId[self.eNB_instance] != '0':
-				mySSH.copyout(f'./*.log', f'{lSourcePath}/cmake_targets/', recursive=True)
+				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, f'./{files}.log', f'{self.eNBSourceCodePath}/cmake_targets/')
 		if self.exitStatus == 0:
 			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
-		mySSH.close()
 
 	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
 		logging.debug('\u001B[1m Checking Services to deploy\u001B[0m')
 		# Implicitly we are running locally
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
-		self.deployKind[0] = False
 		cmd = 'docker-compose config --services'
 		listServices = myCmd.run(cmd)
 		if listServices.returncode != 0:
@@ -1106,16 +1059,6 @@ class Containerize():
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			# In the scenario, for 5G images, we have the choice of either pulling normal images
-			# or -asan images. We need to detect which kind we did pull.
-			if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
-				ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False, silent=self.displayedNewTags)
-				if ret.returncode != 0:
-					tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan')
-					tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan')
-					tagToUse = tagToUse.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
-					if not self.displayedNewTags:
-						logging.debug(f'\u001B[1m Using sanitized version of {image} with {tagToUse}\u001B[0m')
 			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True
@@ -1208,6 +1151,17 @@ class Containerize():
 			self.UndeployGenObject(HTML, RAN, UE)
 			self.exitStatus = 1
 
+	# pyshark livecapture launches 2 processes:
+	# * One using dumpcap -i lIfs -w - (ie redirecting the packets to STDOUT)
+	# * One using tshark -i - -w loFile (ie capturing from STDIN from previous process)
+	# but in fact the packets are read by the following loop before being in fact
+	# really written to loFile.
+	# So it is mandatory to keep the loop
+	def LaunchPySharkCapture(self, lIfs, lFilter, loFile):
+		capture = pyshark.LiveCapture(interface=lIfs, bpf_filter=lFilter, output_file=loFile, debug=False)
+		for packet in capture.sniff_continuously():
+			pass
+
 	def CaptureOnDockerNetworks(self):
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'docker-compose -f docker-compose-ci.yml config | grep com.docker.network.bridge.name | sed -e "s@^.*name: @@"'
@@ -1232,7 +1186,7 @@ class Containerize():
 			myCmd.run(cmd, timeout=5, reportNonZero=False)
 			myCmd.close()
 			return
-		x = threading.Thread(target = LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
+		x = threading.Thread(target = self.LaunchPySharkCapture, args = (interfaces,capture_filter,output_file,))
 		x.daemon = True
 		x.start()
 
@@ -1243,7 +1197,13 @@ class Containerize():
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd)
+		myCmd.run(cmd, silent=self.displayedNewTags)
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
+			myCmd.run(cmd, silent=self.displayedNewTags)
+		self.displayedNewTags = True
 
 		# check which containers are running for log recovery later
 		cmd = 'docker-compose -f docker-compose-ci.yml ps --all'
@@ -1284,7 +1244,7 @@ class Containerize():
 		fullStatus = True
 		if anyLogs:
 			# Analyzing log file(s)!
-			listOfPossibleRanContainers = ['enb*', 'gnb*', 'cu*', 'du*']
+			listOfPossibleRanContainers = ['enb', 'gnb', 'cu', 'du']
 			for container in listOfPossibleRanContainers:
 				filenames = './*-oai-' + container + '.log'
 				cmd = f'ls {filenames}'
@@ -1317,16 +1277,27 @@ class Containerize():
 					logStatus = UE.AnalyzeLogFile_UE(f'{logPath}/{filename}', HTML, RAN)
 					if (logStatus < 0):
 						fullStatus = False
-						self.exitStatus = 1
 						HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
 					else:
 						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
+
+			if self.tsharkStarted:
+				self.tsharkStarted = True
+				cmd = 'killall tshark'
+				myCmd2.run(cmd, reportNonZero=False)
+				cmd = 'killall dumpcap'
+				myCmd2.run(cmd, reportNonZero=False)
+				time.sleep(5)
+				ymlPath = self.yamlPath[0].split('/')
+				# The working dir is still logPath
+				cmd = f'mv /tmp/capture_{ymlPath[1]}.pcap .'
+				myCmd2.run(cmd, timeout=100, reportNonZero=False)
+				self.tsharkStarted = False
 		myCmd2.close()
-		if self.tsharkStarted:
-			self.tsharkStarted = StopPySharkCapture(ymlPath[1])
+
 		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()
@@ -1337,6 +1308,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:
@@ -1377,6 +1351,76 @@ class Containerize():
 
 		HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
 
+	def PingExit(self, HTML, RAN, UE, status, message):
+		if status:
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'OK', [message])
+		else:
+			logging.error('\u001B[1;37;41m ping test FAIL -- ' + message + ' \u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.pingOptions, 'KO', [message])
+			# Automatic undeployment
+			logging.warning('----------------------------------------')
+			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
+			logging.warning('----------------------------------------')
+			HTML.testCase_id = 'AUTO-UNDEPLOY'
+			HTML.desc = 'Automatic Un-Deployment'
+			self.UndeployGenObject(HTML, RAN, UE)
+			self.exitStatus = 1
+
+	def IperfFromContainer(self, HTML, RAN, UE):
+		myCmd = cls_cmd.LocalCmd()
+		self.exitStatus = 0
+
+		ymlPath = self.yamlPath[0].split('/')
+		logPath = '../cmake_targets/log/' + ymlPath[1]
+		cmd = f'mkdir -p {logPath}'
+		myCmd.run(cmd, silent=True)
+
+		# Start the server process
+		cmd = f'docker exec -d {self.svrContName} /bin/bash -c "nohup iperf {self.svrOptions} > /tmp/iperf_server.log 2>&1"'
+		myCmd.run(cmd)
+		time.sleep(3)
+
+		# Start the client process
+		cmd = f'docker exec {self.cliContName} /bin/bash -c "iperf {self.cliOptions}" 2>&1 | tee {logPath}/iperf_client_{HTML.testCase_id}.log'
+		clientStatus = myCmd.run(cmd, timeout=100)
+
+		# Stop the server process
+		cmd = f'docker exec {self.svrContName} /bin/bash -c "pkill iperf"'
+		myCmd.run(cmd)
+		time.sleep(3)
+		serverStatusFilename = f'{logPath}/iperf_server_{HTML.testCase_id}.log'
+		cmd = f'docker cp {self.svrContName}:/tmp/iperf_server.log {serverStatusFilename}'
+		myCmd.run(cmd, timeout=60)
+		myCmd.close()
+
+		# clientStatus was retrieved above. The serverStatus was
+		# written in the background, then copied to the local machine
+		with open(serverStatusFilename, 'r') as f:
+			serverStatus = f.read()
+		(iperfStatus, msg) = AnalyzeIperf(self.cliOptions, clientStatus.stdout, serverStatus)
+		if iperfStatus:
+			logging.info('\u001B[1m Iperf Test PASS\u001B[0m')
+		else:
+			logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m')
+		self.IperfExit(HTML, RAN, UE, iperfStatus, msg)
+
+	def IperfExit(self, HTML, RAN, UE, status, message):
+		html_cell = f'UE\n{message}'
+		if status:
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'OK', [html_cell])
+		else:
+			logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
+			HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', [html_cell])
+			# Automatic undeployment
+			logging.warning('----------------------------------------')
+			logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
+			logging.warning('----------------------------------------')
+			HTML.testCase_id = 'AUTO-UNDEPLOY'
+			HTML.desc = 'Automatic Un-Deployment'
+			self.UndeployGenObject(HTML, RAN, UE)
+			self.exitStatus = 1
+
+
 	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
 		logging.debug('Checking IP routing on ' + svrName)
 		mySSH = SSH.SSHConnection()

ci-scripts/cls_module_ue.py

@@ -41,7 +41,7 @@ import cls_cmd
 
 class Module_UE:
 
-	def __init__(self, module_name, filename="ci_infra.yaml"):
+	def __init__(self, module_name, filename="ci_ueinfra.yaml"):
 		with open(filename, 'r') as f:
 			all_ues = yaml.load(f, Loader=yaml.FullLoader)
 			m = all_ues.get(module_name)
@@ -64,8 +64,7 @@ class Module_UE:
 			self.trace = m.get('trace') == True
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
-			self.runIperf3Server = m.get('RunIperf3Server', True)
-			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
+			logging.info(f'initialized UE {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
 		return f"{self.module_name}@{self.host} [IP: {self.getIP()}]"
@@ -190,9 +189,6 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
-	def getRunIperf3Server(self):
-		return self.runIperf3Server
-
 	def getCmdPrefix(self):
 		return self.cmd_prefix if self.cmd_prefix else ""
 

ci-scripts/cls_oai_html.py

@@ -437,19 +437,13 @@ class HTMLManagement():
 
 		for k in DataLog['Data']:
 			# TestRow 
-			avg = DataLog['Data'][k][0]
-			maxval = DataLog['Data'][k][1]
-			count = DataLog['Data'][k][2]
-			valnorm = float(DataLog['Data'][k][3])
-			dev = DataLog['DeviationThreshold'][k]
-			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
-				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
+			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
+				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			else:
-				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()
 
@@ -475,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_physim.py

@@ -33,11 +33,9 @@ import logging
 import sshconnection
 #to update the HTML object
 import cls_oai_html
-import cls_cmd
 from multiprocessing import SimpleQueue
 #for log folder maintenance
 import os
-import re
 
 class PhySim:
 	def __init__(self):
@@ -65,7 +63,7 @@ class PhySim:
 #PRIVATE Methods
 #-----------------
 
-	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
@@ -86,44 +84,33 @@ class PhySim:
 		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
 		return HTML
 
-	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
-		thrs_KO = int(self.timethrs)
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+	def __CheckResults_LDPCt1Test(self,HTML,CONST,testcase_id):
+		thrs_NOK = 500
+		thrs_KO = 1000
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
-		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
 		mySSH.close()
-		#parse results looking for encoder/decoder processing time values
-
+		#parse results looking for Decoding values
+		runResultsT1=[]
 		with open(self.__runLogFile) as g:
 			for line in g:
-				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
-				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
-				if res_dec is not None:
-					time = res_dec.group(1)
-					info = res_dec.group(0)
-					break
-				if res_enc is not None:
-					time = res_enc.group(1)
-					info = res_enc.group(0)
-					break
-
-		# In case the T2 board does work properly, there is no statistics
-		if res_enc is None and res_dec is None:
-			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
-			self.exitStatus = 1
-			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-			return HTML
-
-		#once parsed move the local logfile to its folder
-		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-		if float(time) < thrs_KO:
+				if 'decoding time' in line:
+					runResultsT1.append(line)
+		info = runResultsT1[0][15:-13]
+		result = int(''.join(filter(str.isdigit, info)))/100
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+		if result < thrs_NOK:
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		else:
-			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
+		elif result > thrs_KO:
+			error_msg = f'Decoding time exceeds a limit of {thrs_KO} us'
 			logging.error(error_msg)
 			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
 			self.exitStatus = 1
+		else:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'NOK', [info])
 		return HTML
 
 	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
@@ -232,7 +219,7 @@ class PhySim:
 		return lHTML
 
 
-	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
 		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
@@ -247,24 +234,25 @@ class PhySim:
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
 		return lHTML
 
-	def Run_T2Test(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
+	def Run_LDPCt1Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
-		os.system(f'mkdir -p ./{self.__runLogPath}')
+		os.system('mkdir -p ./'+self.__runLogPath)
 		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile=f'physim_{str(testcase_id)}.log'
+		self.__runLogFile='physim_'+str(testcase_id)+'.log'
 		#open a session for test run
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
-		mySSH.run(f'cd {self.__workSpacePath}')
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command('cd '+self.__workSpacePath,'\$',5)
 		#run and redirect the results to a log file
-		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCt1Test(htmlObj,constObj,testcase_id)
 		return lHTML
 
 	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):

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,12 +160,12 @@ 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')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 22:
+			if (running_count + completed_count) == 21:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())

ci-scripts/cls_static_code_analysis.py

@@ -42,10 +42,9 @@ from multiprocessing import Process, Lock, SimpleQueue
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-import cls_cmd
-from cls_containerize import CreateWorkspace
 
 #-----------------------------------------------------------
 # Class Declaration
@@ -96,31 +95,53 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
 
-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		if (self.ranAllowMerge):
+			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)
+			else:
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 
-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
-		cmd.run(f'sed -e "s@xenial@bionic@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic')
-		cmd.run(f'docker build --tag oai-cppcheck:bionic --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.bionic . > {logDir}/cppcheck-bionic.txt 2>&1')
-		cmd.run(f'sed -e "s@xenial@focal@" {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.xenial > {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal')
-		cmd.run(f'docker build --tag oai-cppcheck:focal --file {lSourcePath}/ci-scripts/docker/Dockerfile.cppcheck.focal . > {logDir}/cppcheck-focal.txt 2>&1')
-		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 60)
+		mySSH.command('sed -e "s@xenial@bionic@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.bionic', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:bionic --file ci-scripts/docker/Dockerfile.cppcheck.bionic . > cmake_targets/log/cppcheck-bionic.txt 2>&1', '\$', 600)
+		mySSH.command('sed -e "s@xenial@focal@" ci-scripts/docker/Dockerfile.cppcheck.xenial > ci-scripts/docker/Dockerfile.cppcheck.focal', '\$', 6)
+		mySSH.command('docker build --tag oai-cppcheck:focal --file ci-scripts/docker/Dockerfile.cppcheck.focal . > cmake_targets/log/cppcheck-focal.txt 2>&1', '\$', 600)
+		mySSH.command('docker image rm oai-cppcheck:bionic oai-cppcheck:focal || true', '\$', 30)
 
 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/cppcheck-bionic.txt', 'cppcheck-bionic.txt')
-		cmd.copyin(f'{logDir}/cppcheck-focal.txt', 'cppcheck-focal.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()
 
+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 		CCR = CppCheckResults()
 		CCR_ref = CppCheckResults()
 		vId = 0
@@ -230,37 +251,57 @@ class StaticCodeAnalysis():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		self.testCase_id = HTML.testCase_id
+
 		# on RedHat/CentOS .git extension is mandatory
 		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
 		if result is not None:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
+		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
+		mySSH.command('cd ' + lSourcePath, '\$', 5)
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		# Raphael: here add a check if git clone or git fetch went smoothly
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
 
-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-		check_options = ''
-		if self.ranAllowMerge:
-			check_options = f'--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH={self.ranBranch}'
+		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
+		# if the commit ID is provided use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should already been checked earlier
+		argToPass = ''
+		if (self.ranAllowMerge):
+			argToPass = '--build-arg MERGE_REQUEST=true --build-arg SRC_BRANCH=' + self.ranBranch
 			if self.ranTargetBranch == '':
-				if self.ranBranch != 'develop' and self.ranBranch != 'origin/develop':
-					check_options += ' --build-arg TARGET_BRANCH=develop'
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+					argToPass += ' --build-arg TARGET_BRANCH=develop '
 			else:
-				check_options += f' --build-arg TARGET_BRANCH={self.ranTargetBranch}'
+				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+				argToPass += ' --build-arg TARGET_BRANCH=' + self.ranTargetBranch + ' '
 
-		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
-		cmd.run(f'mkdir -p {logDir}')
-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic . > {logDir}/oai-formatting-check.txt 2>&1')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker build --target oai-formatting-check --tag oai-formatting-check:latest ' + argToPass + '--file ci-scripts/docker/Dockerfile.formatting.bionic . > cmake_targets/log/oai-formatting-check.txt 2>&1', '\$', 600)
 
-		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run('docker image prune --force')
-		cmd.run('docker volume prune --force')
+		mySSH.command('docker image rm oai-formatting-check:latest || true', '\$', 60)
+		mySSH.command('docker image prune --force', '\$', 60)
+		mySSH.command('docker volume prune --force', '\$', 60)
 
 		# Analyzing the logs
-		cmd.copyin(f'{logDir}/oai-formatting-check.txt', 'oai-formatting-check.txt')
-		cmd.close()
+		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
+		mySSH.close()
+
+		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '/*', '.')
 
 		finalStatus = 0
 		if (os.path.isfile('./oai-formatting-check.txt')):
@@ -283,7 +324,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 +334,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 +344,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 +381,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/README.md

@@ -29,8 +29,7 @@ Examples:
 - standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
 - gNB-CU: `gnb-cu.sa.f1.conf`
 - monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
-- monolithic eNB: `enb.band7.25prb.usrpb200.conf`
-- RCC (4G eNB with IF4.5 split): `enb-rcc.band7.25prb.tm1.if4p5.conf`
+- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`
 
 Notes:
 - there is no need for TDD/FDD, this is encoded in the band number

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

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

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  250;
-        puCch10xSnr     =  230;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
         }  
 );
 
@@ -224,13 +231,13 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 12
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
          bands          = [38];
          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

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.195"; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
@@ -204,8 +211,8 @@ MACRLCs = (
         bler_target_upper = 20.0;
         bler_target_lower = 10.0;
         max_ul_rb_index   = 27;
-        puSch10xSnr     =  280;
-        puCch10xSnr     =  250;
+        puSch10xSnr     =  190;
+        puCch10xSnr     =  160;
         }  
 );
 
@@ -224,13 +231,13 @@ RUs = (
        local_rf       = "yes"
          nb_tx          = 2
          nb_rx          = 2
-         att_tx         = 18
-         att_rx         = 0;
+         att_tx         = 10
+         att_rx         = 5;
          bands          = [38];
          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

@@ -172,7 +172,12 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +190,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -230,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.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -134,7 +134,13 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -147,7 +153,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.45";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.45";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.45";

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

ci-scripts/conf_files/enb.band7.25prb.l2sim.conf

@@ -172,7 +172,13 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -185,7 +191,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.1";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.1";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.1";
@@ -198,6 +206,7 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
+	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
 	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

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

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.30";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.30";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.30";

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

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

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

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.61.3"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.61.20";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.61.20";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.61.20";

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "no";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.18.48"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.18.48";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "no";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.18.46";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.18.46";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.18.46";

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -180,7 +180,12 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
  ////////// MCE parameters:
-    target_mce_m2_ip_address = ({ ipv4 = "127.0.0.7"; });
+    target_mce_m2_ip_address      = ( { ipv4       = "127.0.0.7";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///M2
     enable_enb_m2 = "yes";
@@ -203,7 +208,9 @@ eNBs =
     NETWORK_INTERFACES :
     {
 
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
@@ -245,7 +252,12 @@ MCEs = (
             //M3
             enable_mce_m3 = "yes";
 
-            target_mme_m3_ip_address = ({ ipv4 = "127.0.0.18"; });
+            target_mme_m3_ip_address      = ( { ipv4       = "127.0.0.18";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
 

ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf

@@ -179,7 +179,13 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     enable_measurement_reports = "no";
 
@@ -192,7 +198,9 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";

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

@@ -177,7 +177,13 @@ eNBs =
     enable_measurement_reports = "yes";
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "172.21.16.137"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "172.21.16.137";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2         = "yes";
@@ -188,7 +194,9 @@ eNBs =
 
     NETWORK_INTERFACES : 
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.68.130";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.68.130";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.68.130";

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

@@ -19,16 +19,147 @@ gNBs =
 
 
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.71.150";
-    remote_s_address = "192.168.71.171";
+    local_s_if_name = "eth0";
+    local_s_address = "192.168.71.140";
+    remote_s_address = "192.168.71.142";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
     remote_s_portd  = 2153;
+    min_rxtxtime                                              = 6;
 
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
     # ------- SCTP definitions
     SCTP :
     {
@@ -39,13 +170,20 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+        amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }
@@ -67,11 +205,15 @@ security = {
   drb_ciphering = "yes";
   drb_integrity = "no";
 };
-
-log_config : {
-  global_log_level = "info";
-  pdcp_log_level = "info";
-  rrc_log_level = "info";
-  f1ap_log_level = "info";
-  ngap_log_level = "info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };

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

@@ -1,22 +1,36 @@
-Active_gNBs = ( "gNB-in-docker");
+Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-in-docker";
+    gNB_ID = 0xe00;
+
+#     cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-CU";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
 
+
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
-    ////////// Physical parameters:
+    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;
+    min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (
     {
@@ -26,10 +40,10 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3300.30 MHz + (19 PRBs + 10 SCs)@30kHz SCS (GSCN: 7715)
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
       absoluteFrequencySSB                                             = 641280;
       dl_frequencyBand                                                 = 78;
-      # this is 3300.30 MHz
+      # this is 3600 MHz
       dl_absoluteFrequencyPointA                                       = 640008;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
@@ -40,12 +54,12 @@ gNBs =
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875;
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPcontrolResourceSetZero                              = 11;
         initialDLBWPsearchSpaceZero                                     = 0;
 
   #uplinkConfigCommon
@@ -126,8 +140,8 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       subcarrierSpacing                                             = 1;
-# SC-FDMA: 0 = enabled, 1 = disabled
-      msg3_transformPrecoder                                        = 0;
+
+
   #tdd-UL-DL-ConfigurationCommon
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
@@ -145,7 +159,6 @@ gNBs =
   }
 
   );
-
     # ------- SCTP definitions
     SCTP :
     {
@@ -156,58 +169,25 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
-
+        amf_ip_address      = ( { ipv4       = "172.21.16.137";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
-
   }
 );
 
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  ul_prbblack_SNR_threshold   = 10;
-  ul_max_mcs                  = 9;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 14;
-  att_rx         = 14;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-}
-);
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -224,16 +204,15 @@ security = {
   drb_ciphering = "yes";
   drb_integrity = "no";
 };
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };

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

@@ -1,77 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-CU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-CU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
-    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"; });
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-     log_config :
-     {
-       global_log_level                      ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
-       ngap_log_level                         ="info";
-    };

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

@@ -8,7 +8,7 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -16,20 +16,151 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
 
 
     nr_cellid = 12345678L;
+    force_256qam_off = 1;
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.71.150";
-    remote_s_address = "0.0.0.0"; # multiple DUs
+    local_s_if_name = "lo";
+    local_s_address = "192.168.72.140";
+    remote_s_address = "192.168.72.143";
     local_s_portc   = 501;
     local_s_portd   = 2152;
     remote_s_portc  = 500;
     remote_s_portd  = 2152;
+    ssb_SubcarrierOffset                                      = 0;
+    min_rxtxtime                                              = 6;
 
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
     # ------- SCTP definitions
     SCTP :
     {
@@ -40,22 +171,28 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "oai-amf"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     E1_INTERFACE =
     (
       {
         type = "cp";
-        ipv4_cucp = "192.168.71.150";
+        ipv4_cucp = "192.168.72.140";
         port_cucp = 38462;
-        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
+        ipv4_cuup = "192.168.72.141";
         port_cuup = 38462;
       }
     )
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150/24";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
     };
   }
 );
@@ -87,6 +224,5 @@ security = {
        rrc_log_level                         ="info";
        f1ap_log_level                         ="info";
        ngap_log_level                         ="debug";
-       sctp_log_level                         ="info";
     };
 

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

@@ -1,82 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
-    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"; });
-
-    E1_INTERFACE =
-    (
-      {
-        type = "cp";
-        ipv4_cucp = "127.0.0.4";
-        port_cucp = 38462;
-        ipv4_cuup = "127.0.0.6";
-        port_cuup = 38462;
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-    };
-  }
-);
-
-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.conf

@@ -7,8 +7,7 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
+    gNB_CU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -21,12 +20,13 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.72.161";
-    remote_s_address = "192.168.72.171";
+    local_s_if_name = "lo";
+    local_s_address = "192.168.72.141";
+    remote_s_address = "192.168.72.142";
     local_s_portc   = 501;
-    local_s_portd   = 2153;
+    local_s_portd   = 2152;
     remote_s_portc  = 500;
-    remote_s_portd  = 2153;
+    remote_s_portd  = 2152;
 
     # ------- SCTP definitions
     SCTP :
@@ -40,23 +40,48 @@ gNBs =
     (
       {
         type = "up";
-        ipv4_cucp = "192.168.71.150";
-        ipv4_cuup = "192.168.71.161";
+        ipv4_cucp = "192.168.72.140";
+        ipv4_cuup = "192.168.72.141";
       }
     )
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.141/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.141/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }
 );
 
-log_config : {
-  global_log_level = "info";
-  pdcp_log_level   = "info";
-  f1ap_log_level   = "info";
-  ngap_log_level   = "info";
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
 };
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="info";
+       ngap_log_level                         ="debug";
+    };
+

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

@@ -1,59 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    tr_s_preference = "f1";
-
-    local_s_address = "127.0.0.6";
-    remote_s_address = "127.0.0.5";
-    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 = "127.0.0.4";
-        ipv4_cuup = "127.0.0.6";
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-log_config: {
-  global_log_level = "info";
-};

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

@@ -7,7 +7,6 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -23,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    force_256qam_off = 1;
 
     servingCellConfigCommon = (
     {
@@ -168,6 +168,7 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
+    local_n_if_name = "eth0";
     local_n_address = "192.168.72.142";
     remote_n_address = "192.168.72.140";
     local_n_portc   = 500;
@@ -217,7 +218,7 @@ THREAD_STRUCT = (
 
 rfsimulator: {
     serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs"

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

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

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

@@ -7,7 +7,6 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -15,7 +14,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 } ) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
 
 
     nr_cellid = 12345678L;
@@ -23,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    force_256qam_off = 1;
 
     servingCellConfigCommon = (
     {
@@ -168,8 +168,9 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_address = "192.168.71.171";
-    remote_n_address = "192.168.71.150";
+    local_n_if_name = "eth0";
+    local_n_address = "192.168.71.142";
+    remote_n_address = "192.168.71.140";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;
@@ -216,45 +217,21 @@ THREAD_STRUCT = (
 );
 rfsimulator: {
 serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs"
 }
 
-log_config: {
-  global_log_level = "info";
-  hw_log_level = "info";
-  phy_log_level = "info";
-  mac_log_level = "info";
-  rlc_log_level = "info";
-  f1ap_log_level = "info";
-};
-
-#/* configuration for channel modelisation */
-#/* To be included in main config file when */
-#/* channel modelisation is used (rfsimulator with chanmod options enabled) */
-channelmod = {
-  max_chan = 10;
-  modellist = "modellist_rfsimu_1";
-  modellist_rfsimu_1 = (
-    { # DL, modify on UE side
-      model_name     = "rfsimu_channel_enB0"
-      type           = "AWGN";
-      ploss_dB       = 20;
-      noise_power_dB = -4;
-      forgetfact     = 0;
-      offset         = 0;
-      ds_tdl         = 0;
-    },
-    { # UL, modify on gNB side
-      model_name     = "rfsimu_channel_ue0"
-      type           = "AWGN";
-      ploss_dB       = 20;
-      noise_power_dB = -2;
-      forgetfact     = 0;
-      offset         = 0;
-      ds_tdl         = 0;
-    }
-  );
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };

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

@@ -7,7 +7,6 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 
@@ -23,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime                                              = 6;
+    force_256qam_off = 1;
 
 
     servingCellConfigCommon = (
@@ -169,14 +169,16 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_address = "127.0.0.5";
-    remote_n_address = "127.0.0.4";
+    local_n_if_name = "eth0";
+    local_n_address = "192.168.68.195";
+    remote_n_address = "192.168.68.194";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;
     remote_n_portd  = 2153;
     pusch_TargetSNRx10          = 200;
     pucch_TargetSNRx10          = 200;
+    ulsch_max_frame_inactivity = 1;
   }
 );
 
@@ -185,7 +187,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 100;
+  pucch0_dtx_threshold = 150;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -216,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-vnf.sa.band78.273prb.aerial.conf

@@ -1,254 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-sa = 1;
-nfapi = "AERIAL";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                    }
-                  );
-                  });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-    do_SRS                = 0;
-    min_rxtxtime          = 2;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
-      absoluteFrequencySSB                                          = 649920;
-      #652860; #should be 649920
-#647520;
-#647540;
-#649920;
-#650208;
-#647540;
-      dl_frequencyBand                                              = 78;
-      # this is 3300.24 MHz
-      dl_absoluteFrequencyPointA                                    = 646724;
-#649104;
-#646724;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        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                                           = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 98
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          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                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 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                                 = 5; #6;
-      nrofDownlinkSlots                                             = 3; #7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1; #2;
-      nrofUplinkSymbols                                             = 0;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.130";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.130";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc           = 1;
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.2"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-  tr_s_preference             = "aerial";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200; # 150;
-  pucch_TargetSNRx10          = 200; #200;
-  ulsch_max_frame_inactivity  = 10;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};

ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf

@@ -1,42 +1,41 @@
-Active_gNBs = ( "gNB-OAI");
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-sa = 1;
-
 gNBs =
 (
  {
     ////////// Identification parameters:
     gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-    nr_cellid = 12345678L;
+    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
 
     tr_s_preference     = "local_mac"
 
     ////////// Physical parameters:
 
-    sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
 	
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
 
-      physCellId                                                    = 10;
+      physCellId                                                    = 0;
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 2071387;
+      # this is pointA + 23 PRBs@120kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 2071241;
       dl_frequencyBand                                                 = 261;
       # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2071001;
+      dl_absoluteFrequencyPointA                                       = 2070833;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -51,7 +50,7 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 3;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 1;
+        initialDLBWPcontrolResourceSetZero                                      = 12;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
@@ -86,12 +85,12 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 7;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 7;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
         ra_ContentionResolutionTimer                                = 7;
@@ -102,7 +101,8 @@ gNBs =
         prach_RootSequenceIndex                                     = 1;
         # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
         #  
-        msg1_SubcarrierSpacing                                      = 3;
+        msg1_SubcarrierSpacing                                      = 3,
+
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
         restrictedSetConfig                                         = 0,
@@ -119,7 +119,7 @@ gNBs =
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
       ssb_PositionsInBurst_PR                                       = 3;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
+      ssb_PositionsInBurst_Bitmap                                   = 0x0001000100010001L;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -152,6 +152,7 @@ gNBs =
 
   );
 
+
     # ------- SCTP definitions
     SCTP :
     {
@@ -161,51 +162,91 @@ gNBs =
     };
 
 
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.18.99";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    ///X2
+    enable_x2 = "no";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "192.168.18.199";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
+
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.18.198/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.18.198/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.18.198/24";
+        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
 );
 
-MACRLCs = ({
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-});
+MACRLCs = (
+	{
+	    num_cc                      = 1;
+	    tr_s_preference             = "local_L1";
+	    tr_n_preference             = "local_RRC";
+	    pusch_TargetSNRx10          = 200;
+            pucch_TargetSNRx10          = 200;
+    }
+);
 
 L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold   = 120;
-  #pucch0_dtx_threshold = 120;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
 
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  sl_ahead       = 12;
-  bands          = [261];
-  max_pdschReferenceSignalPower = -27;
-  eNB_instances  = [0];
-});
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 1;
+         nb_rx          = 1;
+         att_tx         = 0;
+         att_rx         = 0;
+         bands          = [7];
+         sl_ahead       = 12;
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 75;
+         eNB_instances  = [0];
+	 sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
+         if_freq = 5124520000L;
+	 clock_src = "external";
+	 time_src = "external";
+    }
+);  
 
 rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -223,6 +264,14 @@ security = {
   drb_integrity = "no";
 };
 
-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";
+    };
+

ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf

@@ -150,12 +150,19 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; });
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -162,12 +162,20 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf

@@ -162,12 +162,20 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf

@@ -162,10 +162,18 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES : {
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
         GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };

ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf

@@ -1,234 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts = 2;
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 621312;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 273;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        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                                            = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
-# 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                               = -118;
-#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                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        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 :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "192.168.12.26"; port = 36412; });
-
-    NETWORK_INTERFACES : {
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = ({
-  num_cc = 1;
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
-});
-
-L1s = ({
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-});
-
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 2
-  nb_rx          = 2
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 50;
-  eNB_instances  = [0];
-  bf_weights = [0x00007fff, 0x0000];
-  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-});
-
-THREAD_STRUCT = ({
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-});
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-};

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

@@ -63,7 +63,6 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;
-        initialDLBWPcontrolResourceSetZero                                      = 0;
       #rach-ConfigCommon
         #rach-ConfigGeneric
           prach_ConfigurationIndex                                  = 98;
@@ -158,7 +157,13 @@ gNBs =
 
 
     ////////// MME parameters:
-#    mme_ip_address = ({ ipv4 = "192.168.68.130"; port = 36412; });
+#    mme_ip_address      = ( { ipv4       = "192.168.68.130";
+#                              ipv6       = "192:168:30::17";
+#                              port       = 36412 ;
+#                              active     = "yes";
+#                              preference = "ipv4";
+#                            }
+#                          );
 
     ///X2
     enable_x2         = "yes";
@@ -167,11 +172,17 @@ gNBs =
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
 
-    target_enb_x2_ip_address = ({ ipv4 = "192.168.68.130"; });
+    target_enb_x2_ip_address = ( { ipv4       = "192.168.68.130";
+                                   ipv6       = "192:168:30::17";
+                                   preference = "ipv4";
+                                 }
+                               );
 
     NETWORK_INTERFACES :
     {
+      GNB_INTERFACE_NAME_FOR_S1_MME  = "eth0";
       GNB_IPV4_ADDRESS_FOR_S1_MME    = "192.168.68.194";
+      GNB_INTERFACE_NAME_FOR_S1U     = "eth0";
       GNB_IPV4_ADDRESS_FOR_S1U       = "192.168.68.194";
       GNB_PORT_FOR_S1U               = 2152; # Spec 2152
       GNB_IPV4_ADDRESS_FOR_X2C       = "192.168.68.194";
@@ -188,6 +199,7 @@ MACRLCs = (
     tr_n_preference     = "local_RRC";
     pusch_TargetSNRx10  = 200;
     pucch_TargetSNRx10  = 200;
+    ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf

@@ -163,7 +163,12 @@ gNBs =
 
 
     ////////// MME parameters:
-    amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+    amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     ///X2
     enable_x2 = "yes";
@@ -171,12 +176,19 @@ gNBs =
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address = ({ ipv4 = "CI_FR1_CTL_ENB_IP_ADDR"; });
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "CI_FR1_CTL_ENB_IP_ADDR";
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
 
     NETWORK_INTERFACES :
     {
 
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         GNB_IPV4_ADDRESS_FOR_X2C                 = "CI_GNB_IP_ADDR";
@@ -190,6 +202,7 @@ MACRLCs = (
   num_cc                     = 1;
   tr_s_preference            = "local_L1";
   tr_n_preference            = "local_RRC";
+  ulsch_max_frame_inactivity = 0;
 }
 );
 

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
@@ -160,12 +160,19 @@ gNBs =
 
 
     ////////// MME parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -223,7 +230,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
     serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";

ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -28,11 +28,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+      # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
       absoluteFrequencySSB                                          = 430590;
       dl_frequencyBand                                              = 66;
-      # this is 2150.43 MHz
-      dl_absoluteFrequencyPointA                                    = 430086;
+      # this is 2150 MHz
+      dl_absoluteFrequencyPointA                                    = 430000;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -53,8 +53,8 @@ gNBs =
   #uplinkConfigCommon
      #frequencyInfoUL
       ul_frequencyBand                                              = 66;
-      # this is 1750.43 MHz
-      ul_absoluteFrequencyPointA                                    = 350086;
+      # this is 1750 MHz
+      ul_absoluteFrequencyPointA                                    = 350000;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -161,11 +161,18 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/26";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eno1";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/26";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -180,6 +187,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 0;
 }
 );
 
@@ -232,7 +240,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
   serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";

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

@@ -1,253 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-sa = 1;
-usrp-tx-thread-config = 1;
-tune-offset = 30720000;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    ssb_SubcarrierOffset  = 0;
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-    do_SRS                = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
-      absoluteFrequencySSB                                             = 673344;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                       = 671400;
-      dl_frequencyBand                                                 = 77;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 162;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 162;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-     #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
-# 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                                 = 12;
-          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                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 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                                                  = -70;
-# 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                                 = 5;
-      nrofDownlinkSlots                                             = 2;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                             = -20;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.61.132"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 300;
-  ulsch_max_frame_inactivity  = 0;
-  pusch_FailureThres          = 100;
-  ul_max_mcs		      = 28;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pusch_dtx_threshold = 20;
-  max_ldpc_iterations = 20;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 2;
-  nb_rx          = 2;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain     = 72;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
-
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};

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

@@ -1,248 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-sa = 1;
-usrp-tx-thread-config = 1;
-
-gNBs = (
-{
-  ////////// Identification parameters:
-  gNB_ID    = 0xe00;
-  gNB_name  = "gNB-OAI";
-
-  // Tracking area code, 0x0000 and 0xfffe are reserved values
-  tracking_area_code = 1;
-  plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }); });
-
-  nr_cellid = 12345678L;
-
-  ////////// Physical parameters:
-
-  pdsch_AntennaPorts_XP = 2;
-  pusch_AntennaPorts    = 2;
-  do_CSIRS              = 1;
-  do_SRS                = 1;
-  ul_prbblacklist       = "135,136,137,138"
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-      # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
-      absoluteFrequencySSB                  = 673344;
-      dl_frequencyBand                      = 77;
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            = 670068;
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;
-      dl_carrierBandwidth                   = 273;
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 1099;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                   = 1;
-
-      # pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                = 12;
-      initialDLBWPsearchSpaceZero                       = 0;
-
-    # uplinkConfigCommon
-      # frequencyInfoUL
-      ul_frequencyBand                                  = 77;
-      # scs-SpecificCarrierList
-      ul_offstToCarrier                                 = 0;
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                              = 1;
-      ul_carrierBandwidth                               = 273;
-      pMax                                              = 20;
-
-      # initialUplinkBWP
-        # genericParameters
-        initialULBWPlocationAndBandwidth                = 1099;
-        # 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                     = 12;
-          preambleReceivedTargetPower                   = -90;
-          # preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                              = 6;
-          # powerRampingStep
-          # 0=dB0,1=dB2,2=dB4,3=dB6
-          powerRampingStep                              = 1;
-          # ra_ReponseWindow
-          # 1,2,4,8,10,20,40,80
-          ra_ResponseWindow                             = 4;
-          # ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-          # 1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR  = 3;
-          # oneHalf (0..15) 4,8,12,16,...60,64
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 15;
-          # ra_ContentionResolutionTimer
-          # (0..7) 8,16,24,32,40,48,56,64
-          ra_ContentionResolutionTimer                  = 7;
-          rsrp_ThresholdSSB                             = 19;
-          # prach-RootSequenceIndex_PR
-          # 1 = 839, 2 = 139
-          prach_RootSequenceIndex_PR                    = 2;
-          prach_RootSequenceIndex                       = 1;
-          # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-          msg1_SubcarrierSpacing                        = 1,
-          # restrictedSetConfig
-          # 0=unrestricted, 1=restricted type A, 2=restricted type B
-          restrictedSetConfig                           = 0,
-          msg3_DeltaPreamble                            = 1;
-          p0_NominalWithGrant                           =-90;
-
-        # pucch-ConfigCommon
-          # pucchGroupHopping
-          # 0 = neither, 1= group hopping, 2=sequence hopping
-          pucchGroupHopping                             = 0;
-          hoppingId                                     = 40;
-          p0_nominal                                    = -70;
-
-      # dmrs_TypeA_position
-      # 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                               = 0;
-
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                 = 1;
-
-
-    # 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;
-
-    #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 :
-  {
-    # Number of streams to use in input/output
-    SCTP_INSTREAMS  = 2;
-    SCTP_OUTSTREAMS = 2;
-  };
-
-
-  ////////// AMF parameters:
-  amf_ip_address = ({ ipv4 = "192.168.61.132"; });
-
-  NETWORK_INTERFACES :
-  {
-    GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/24";
-    GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/24";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 1000;
-  ulsch_max_frame_inactivity  = 0;
-  ul_max_mcs                  = 25;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  max_ldpc_iterations = 15;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 2;
-  nb_rx          = 2;
-  att_tx         = 12;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 72;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "addr=192.168.80.53,clock_source=internal,time_source=internal"
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};

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

@@ -158,12 +158,19 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.128";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eno1";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.128";
         GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
@@ -174,6 +181,7 @@ gNBs =
 MACRLCs = (
         {
         num_cc = 1;
+        local_s_if_name  = "lo:";
         remote_s_address = "127.0.0.1"; // pnf addr [!]
         local_s_address  = "127.0.0.2"; // vnf addr
         local_s_portc    = 50601; // vnf p5 port

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -6,14 +6,14 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;
 
     gNB_name  =  "gNB-OAI";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
 
-    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({sst = 1;}); });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({sst = 1;}); });
 
     nr_cellid = 12345678L
 
@@ -170,12 +170,19 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "172.21.6.100"; });
+        amf_ip_address      = ( { ipv4       = "172.21.6.100";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
 
         NETWORK_INTERFACES :
         {
 
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/22";
+           GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/22";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
@@ -190,6 +197,8 @@ MACRLCs = (
   tr_n_preference  = "local_RRC";
   pusch_TargetSNRx10 = 180;
   pucch_TargetSNRx10 = 200;
+  ulsch_max_frame_inactivity = 1;
+  ul_max_mcs = 16;
 }
 );
 
@@ -211,7 +220,7 @@ RUs = (
   att_rx         = 0;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 65;
+  max_rxgain                    = 75;
   eNB_instances  = [0];
   ##beamforming 1x2 matrix: 1 layer x 2 antennas
   bf_weights = [0x00007fff, 0x0000];

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf

@@ -85,7 +85,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
@@ -161,12 +161,19 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -181,6 +188,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   #pusch_TargetSNRx10         = 150;
   #pucch_TargetSNRx10         = 200;
+  ulsch_max_frame_inactivity  = 0;
   dl_max_mcs                  = 16; # there are retransmissions if more
 }
 );
@@ -224,7 +232,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
   serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";

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

@@ -88,7 +88,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
@@ -164,12 +164,19 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+        amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
 
         NETWORK_INTERFACES :
         {
 
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+           GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };

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

@@ -1,321 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
- ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
-
-    @include "neighbour-config.conf"
-    nr_cellid = 1;
-
- ////////// Physical parameters:
-
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-    min_rxtxtime = 6;
-      pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-      );
-
-    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                              = 12;
-        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;
-     }
-
-    );
-
-    # Dedicated Serving Cell Configuration
-    servingCellConfigDedicated = ({
-    # BWP-Downlink
-      # BWP 1 Configuration
-        dl_bwp-Id_1 = 1;
-        dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        dl_bwp-Id_2 = 2;
-        dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        dl_bwp-Id_3 = 3;
-        dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp3_subcarrierSpacing = 1;
-
-      firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-      defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-      # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-      #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-      #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-      #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-    # UplinkConfig
-      # BWP-Uplink
-        # BWP 1 Configuration
-          ul_bwp-Id_1 = 1;
-          ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp1_subcarrierSpacing = 1;
-
-        # BWP 2 Configuration
-          ul_bwp-Id_2 = 2;
-          ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp2_subcarrierSpacing = 1;
-
-        # BWP 3 Configuration
-          ul_bwp-Id_3 = 3;
-          ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp3_subcarrierSpacing = 1;
-
-        firstActiveUplinkBWP-Id = 1;  #BWP-Id
-      }
-    );
-
-
-    # ------- SCTP definitions
-    SCTP : {
-       # Number of streams to use in input/output
-       SCTP_INSTREAMS  = 2;
-       SCTP_OUTSTREAMS = 2;
-     };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ( { ipv4 = "192.168.70.132"; });
-
-
-    NETWORK_INTERFACES : {
-	   GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129";
-	   GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129";
-	   GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = ({
-  local_rf       = "yes";
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-});
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator: {
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs"
-}
-
-security = {
-# preferred ciphering algorithms
-# the first one of the list that an UE supports in chosen
-# valid values: nea0, nea1, nea2, nea3
-	ciphering_algorithms = ( "nea0" );
-
-# preferred integrity algorithms
-# the first one of the list that an UE supports in chosen
-# valid values: nia0, nia1, nia2, nia3
-	integrity_algorithms = ( "nia2", "nia0" );
-
-# setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-# what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-	drb_ciphering = "yes";
-	drb_integrity = "no";
-};
-
-log_config : {
-	global_log_level                      ="info";
-	hw_log_level                          ="info";
-	phy_log_level                         ="info";
-	mac_log_level                         ="info";
-	rlc_log_level                         ="info";
-	pdcp_log_level                        ="info";
-	nr_rrc_log_level		                  ="info";
-	rrc_log_level                         ="info";
-	ngap_log_level                        ="debug";
-	f1ap_log_level                        ="debug";
-};

ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf

@@ -163,12 +163,19 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
 
         NETWORK_INTERFACES :
         {
 
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
@@ -183,6 +190,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 220;
     pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf

@@ -176,12 +176,19 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
 
         NETWORK_INTERFACES :
         {
 
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
@@ -196,6 +203,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 220;
     pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf

@@ -177,12 +177,19 @@ gNBs =
     };
 
     ////////// AMF parameters:
-        amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
+        amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                                  ipv6       = "192:168:30::17";
+                                  active     = "yes";
+                                  preference = "ipv4";
+                                                                                                                              }
+                                                                                                                                          );
 
         NETWORK_INTERFACES :
         {
 
+           GNB_INTERFACE_NAME_FOR_NG_AMF            = "em1";
            GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_INTERFACE_NAME_FOR_NGU               = "em1";
            GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
@@ -197,6 +204,7 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
 #    pucch_TargetSNRx10 = 150;
+     ulsch_max_frame_inactivity = 0;
   }
 );
 

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -82,7 +82,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        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;
@@ -159,12 +159,19 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -179,6 +186,7 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 150;
   pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 1;
 }
 );
 

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

@@ -10,13 +10,13 @@ gNBs =
 (
  {
     ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;
 
     gNB_name  =  "gNB-Eurecom-n78_20";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
 
     nr_cellid = 12345678L
 
@@ -24,7 +24,7 @@ gNBs =
     pdsch_AntennaPorts_XP                                     = 2;
     pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;
 
     servingCellConfigCommon = (
     {
@@ -35,10 +35,10 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 630048;
+      absoluteFrequencySSB                                             = 627360;
       dl_frequencyBand                                                 = 78;
       # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
-      dl_absoluteFrequencyPointA                                       = 629436;
+      dl_absoluteFrequencyPointA                                       = 626748;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -75,7 +75,7 @@ gNBs =
         initialULBWPsubcarrierSpacing                                           = 1;
       #rach-ConfigCommon
         #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
+          prach_ConfigurationIndex                                  = 98;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
@@ -166,12 +166,19 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.100"; });
+    amf_ip_address      = ( { ipv4       = "172.21.6.100";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
 
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/20";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/20";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
@@ -185,6 +192,8 @@ MACRLCs = (
     tr_n_preference  = "local_RRC";
     pusch_TargetSNRx10 = 200;
     pucch_TargetSNRx10 = 200;
+    ulsch_max_frame_inactivity = 10;
+    ul_max_mcs         = 28;
   }
 );
 
@@ -211,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

@@ -156,13 +156,20 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.16.137"; });
+    amf_ip_address      = ( { ipv4       = "172.21.16.137";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -177,6 +184,7 @@ MACRLCs = (
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 0;
 }
 );
 

ci-scripts/conf_files/lteue.band7.25prb.l2sim.conf

@@ -13,6 +13,7 @@ L1s = (
         {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
+	local_n_if_name  = "eno1";
 	remote_n_address = "127.0.0.1";
 	local_n_address  = "127.0.0.1";
 	local_n_portc    = 50000;

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/conf_files/neighbour-config.conf

@@ -1,76 +0,0 @@
-neighbour_list = (
-  {
-    nr_cellid = 1;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xb00;
-        nr_cellid = 2;
-        physical_cellId = 0x002;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 216; mnc = 03; mnc_length = 2};
-        tracking_area_code = 2;
-      },
-      {
-        gNB_ID = 0xa00;
-        nr_cellid = 3;
-        physical_cellId = 0x003;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 3;
-      },
-      {
-        gNB_ID = 0xc00;
-        nr_cellid = 4;
-        physical_cellId = 0x004;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 4;
-      }
-  )
-  },
-  {
-    nr_cellid = 2;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe00;
-        nr_cellid = 1;
-        physical_cellId = 0x000;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 001; mnc = 01; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  }
- );
-
-
-nr_measurement_configuration = {
-  Periodical = {
-    enable = 1;
-    includeBeamMeasurements = 1;
-    maxNrofRS_IndexesToReport = 4;
-  };
-
-  A2 = {
-    enable = 1;
-    threshold = 60;
-    timeToTrigger = 1;
-  };
-
-  A3 = ({
-    cell_id = -1; #Default
-    offset = 10;
-    hysteresis = 0;
-    timeToTrigger = 1
-  }, {
-    cell_id = 2;
-    offset = 5;
-    hysteresis = 1;
-    timeToTrigger = 2
-  })
-};
-

ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf

@@ -21,6 +21,7 @@ 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";
         local_n_portc    = 50600;

ci-scripts/conf_files/nrue.uicc.conf

@@ -5,31 +5,3 @@ uicc0 = {
   dnn= "oai";
   nssai_sst=1;
 }
-
-#/* configuration for channel modelisation */
-#/* To be included in main config file when */
-#/* channel modelisation is used (rfsimulator with chanmod options enabled) */
-channelmod = {
-  max_chan = 10;
-  modellist = "modellist_rfsimu_1";
-  modellist_rfsimu_1 = (
-    { # DL, modify on UE side
-      model_name     = "rfsimu_channel_enB0"
-      type           = "AWGN";
-      ploss_dB       = 20;
-      noise_power_dB = -4;
-      forgetfact     = 0;
-      offset         = 0;
-      ds_tdl         = 0;
-    },
-    { # UL, modify on gNB side
-      model_name     = "rfsimu_channel_ue0"
-      type           = "AWGN";
-      ploss_dB       = 20;
-      noise_power_dB = -2;
-      forgetfact     = 0;
-      offset         = 0;
-      ds_tdl         = 0;
-    }
-  );
-};

ci-scripts/conf_files/rcc.band38.tm1.50PRB.multi.rru.conf

@@ -139,11 +139,19 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; port = 36412; });
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
     NETWORK_INTERFACES :
     {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "enp129s0f0";
         ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "enp129s0f0";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR"; #"127.0.0.4/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152\