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

Updates in this MR are as follows: 1) Enabled support for MCS 1-16; Fixed SNR estimation 2) Added multiple SLSCH feedback support in PSFCH 3) Implemented HARQ process for first transmission and reception 4) Implemented sync notification from nearby to syncref 5) Fixed PSFCH issue in sci_payload in case of psfch_period zero 6) Fixed order of SL UE phy params initializations 7) Moved gNB specific list functions to common file 8) Developed thread lock functions for NR_UE_SL_SCHED 9) Included header files for common moved functions in gNB code 10) Fixed l value in computing alpha for pucch0 11) Fixed warnings 12) cleaned code
Merge branch 'episys/ea/harq_implementation' into 'episys/sl-eurecom2'
2026-07-19 23:50:30 +00:00 · 2024-08-16 09:45:53 -07:00 · 2024-07-30 22:32:29 +00:00 · 2024-07-29 15:32:10 +00:00 · 2024-07-29 15:30:48 +00:00 · 2024-07-26 19:55:02 +00:00
1662 changed files with 96840 additions and 507981 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -60,8 +60,6 @@ ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
-  - RB_FOREACH
-  - UE_iterator
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,8 @@ cmake_targets/nas_sim_tools/build/
 log/
 lte_build_oai/

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

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

-
-
 include("cmake_targets/macros.cmake")

 ##############################
@@ -84,17 +82,12 @@ set (NFAPI_USER_DIR  ${OPENAIR_DIR}/nfapi/oai_integration)
 set (OPENAIR1_DIR    ${OPENAIR_DIR}/openair1)
 set (OPENAIR2_DIR    ${OPENAIR_DIR}/openair2)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
-set (SIDL_DIR        ${OPENAIR_DIR}/openair3/SS/Sidl/lib)
-set (SIDL_CMPLR      ${OPENAIR_DIR}/openair3/SS/Sidl/sidl)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
 set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})

 project (OpenAirInterface)

-set(CMAKE_C_COMPILER "/usr/bin/gcc")
-set(CMAKE_CXX_COMPILER "/usr/bin/g++")
-
 ####################################################
 # compilation flags
 #############################################
@@ -109,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")
@@ -148,19 +139,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
  if(CPUINFO MATCHES "ssse3")
    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
  endif()
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -mfloat-abi=hard -mfpu=neon -lgcc -lrt")
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
-else()
-  message(FATAL_ERROR "compile for CPU architecture ${CPUARCH}, CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
+elseif(${CPUARCH} NOT STREQUAL "x86_64")
+  message(FATAL_ERROR "Cannot compile for CPU architecture ${CPUARCH}")
 endif()

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

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

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

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

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

-
 # asn1c skeletons have hardcoded this flag to make customized debug logs
 # OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
 if (DEBUG_ASN1C)
@@ -310,15 +282,6 @@ add_definitions(-DHAVE_NETINET_IN_H)
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")

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

 # LPP
 ##############
@@ -484,23 +446,19 @@ add_list1_option(NB_ANTENNAS_RX "4" "Number of antennas in reception" "1" "2" "4
 add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")

 set (CONFIG_ROOTDIR ${OPENAIR_DIR}/common/config)
-add_library(config_internals OBJECT
-  ${CONFIG_ROOTDIR}/config_common.c
-)
-
 add_library(CONFIG_LIB
  ${CONFIG_ROOTDIR}/config_load_configmodule.c
  ${CONFIG_ROOTDIR}/config_userapi.c
  ${CONFIG_ROOTDIR}/config_cmdline.c
 )
-target_link_libraries(CONFIG_LIB PRIVATE config_internals dl UTIL)

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

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

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

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

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

 ##########################################################
@@ -621,12 +578,10 @@ include_directories("${OPENAIR3_DIR}/NAS/COMMON/IES")
 include_directories("${OPENAIR3_DIR}/NAS/COMMON/UTIL")
 include_directories("${OPENAIR3_DIR}/SECU")
 include_directories("${OPENAIR3_DIR}/SCTP")
-include_directories("${OPENAIR3_DIR}/SS")
 include_directories("${OPENAIR3_DIR}/S1AP")
 include_directories("${OPENAIR2_DIR}/X2AP")
 include_directories("${OPENAIR2_DIR}/M2AP")
 include_directories("${OPENAIR2_DIR}/F1AP")
-include_directories("${OPENAIR3_DIR}/UDP")
 include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
@@ -662,7 +617,6 @@ include_directories(${OPENAIR_DIR}/common/utils/hashtable)

 add_library(UTIL
  ${OPENAIR_DIR}/common/utils/LOG/log.c
-  ${OPENAIR_DIR}/common/utils/LOG/ss-tp.c
  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
@@ -672,8 +626,7 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/time_meas.c
  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-
-target_link_libraries(UTIL PUBLIC asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs ${T_LIB} pthread)
+target_link_libraries(UTIL PUBLIC ${T_LIB})

 set(SECURITY_SRC
  ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -705,7 +658,7 @@ set(SCHED_SRC
  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})
-target_link_libraries(SCHED_LIB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
@@ -714,7 +667,7 @@ set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
-target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs)

 set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -722,7 +675,7 @@ set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-target_link_libraries(SCHED_RU_LIB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -736,6 +689,7 @@ target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue_sl.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/fapi_nr_ue_l1.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_frame_config_nr_ue.c
  ${OPENAIR1_DIR}/SCHED_NR_UE/harq_nr.c
@@ -744,6 +698,7 @@ 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
@@ -800,10 +755,6 @@ add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
 target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 include_directories(${NFAPI_USER_DIR})

-# nFAPI lib selection based on the flag
-############################################
-set (NFAPI_STATIC_LIB  ${OPENAIR_DIR}/../../../Multi-Ue-Proxy/static-lib/libNFAPI-P7.a)
-
 # Layer 1
 #############################
 set(PHY_TURBOSRC
@@ -841,30 +792,19 @@ set(PHY_LDPC_ORIG_SRC
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
 )
-add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
-target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)

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

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

 ##############################################
 # Base CUDA setting
@@ -902,10 +850,16 @@ if (ENABLE_LDPC_CUDA)
  endif()
 endif()

-add_library(coding MODULE ${PHY_TURBOSRC} )
-target_link_libraries(coding PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)

-add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
+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 )


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

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

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

 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

-pkg_check_modules(blas REQUIRED blas)
-pkg_check_modules(lapacke REQUIRED lapacke)
+#pkg_check_modules(blas REQUIRED blas)
+#pkg_check_modules(lapacke REQUIRED lapacke)

 add_library(PHY_UE ${PHY_SRC_UE})
 target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1182,13 +1148,10 @@ target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapa
 target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})

 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
-target_link_libraries(PHY_NR_COMMON PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

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

 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
@@ -1259,21 +1222,16 @@ set(NR_PDCP_SRC
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_sdu.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_timer_thread.c
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_security_nea2.c
-  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_security_nea1.c
  ${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_DIR}/LAYER2/nr_pdcp/cucp_cuup_handler.c
-  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/cuup_cucp_if.c
-  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/cuup_cucp_direct.c
-  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
  )

 set(NR_SDAP_SRC
  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
  ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
  )
-
+  
 set(L2_SRC
  ${PDCP_DIR}/pdcp.c
  ${PDCP_DIR}/pdcp_fifo.c
@@ -1319,6 +1277,7 @@ set(L2_NR_SRC
  ${NR_SDAP_SRC}
  ${NR_RRC_DIR}/rrc_gNB.c
  ${NR_RRC_DIR}/nr_rrc_common.c
+  ${NR_RRC_DIR}/L2_nr_interface.c
  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
  ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
  ${NR_RRC_DIR}/nr_rrc_config.c
@@ -1328,8 +1287,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
@@ -1411,7 +1368,7 @@ set (MAC_NR_SRC


 set (MAC_SRC_UE
-  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
+	#  ${PHY_INTERFACE_DIR}/phy_stub_UE.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${MAC_DIR}/main_ue.c
  ${MAC_DIR}/ue_procedures.c
@@ -1434,6 +1391,8 @@ set (MAC_NR_SRC_UE
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_sci_slsch.c
+  ${NR_UE_MAC_DIR}/nr_slsch_scheduler.c
 )

 set (ENB_APP_SRC
@@ -1459,14 +1418,12 @@ set (MISC_NFAPI_LTE
 )

 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})
-target_link_libraries(MISC_NFAPI_LTE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)

 set (MISC_NFAPI_NR
 ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
 )

 add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
-target_link_libraries(MISC_NFAPI_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_library(L2
  ${L2_SRC}
@@ -1476,13 +1433,15 @@ add_library(L2
  )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-
 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_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)

@@ -1502,12 +1461,19 @@ add_library(e1_if

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

+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 e2_ran_func)
+  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()

+
 add_library(L2_LTE_NR
  ${L2_RRC_SRC}
  ${MAC_SRC}
@@ -1573,39 +1539,6 @@ add_library(MME_APP ${MME_APP_SRC})
 target_link_libraries(MME_APP PRIVATE m2ap m3ap)
 target_link_libraries(MME_APP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-#------------------------------------------------------
-include_directories (SIDL_SRC_DIR ${SIDL_CMPLR}/api)
-include_directories (SIDL_SRC_DIR ${SIDL_DIR}/acp/api)
-include_directories (SIDL_SRC_DIR ${SIDL_DIR}/adbg/api)
-include_directories (SIDL_SRC_DIR ${SIDL_DIR}/ser/api)
-set(SS_SRC
-  ${OPENAIR3_DIR}/SS/ss_eNB_port_man_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_sys_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_sysind_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_srb_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_vng_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_vtp_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_drb_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_vt_timer_task.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_srb_task.c
-  ${OPENAIR3_DIR}/SS/ss_eNB_multicell_helper.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_port_man_task.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_sys_task.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_vtp_task.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_drb_task.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_vt_timer_task.c
-  ${OPENAIR3_DIR}/SS/ss_utils.c
-  ${OPENAIR3_DIR}/SS/ss_gNB_multicell_helper.c
-)
-file(GLOB ss_sidl ${SIDL_CMPLR}/src/*.c)
-file(GLOB ss_acp ${SIDL_DIR}/acp/src/*.c)
-file(GLOB ss_adbg ${SIDL_DIR}/adbg/src/*.c)
-file(GLOB ss_ser ${SIDL_DIR}/ser/src/*.c)
-
-add_library(SS_SERVER ${ss_sidl} ${ss_acp} ${ss_adbg} ${ss_ser} ${SS_SRC})
-target_link_libraries(SS_SERVER PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-#------------------------------------------------------
-
 set(SCTP_SRC
  ${OPENAIR3_DIR}/SCTP/sctp_common.c
  ${OPENAIR3_DIR}/SCTP/sctp_eNB_task.c
@@ -1614,9 +1547,6 @@ set(SCTP_SRC
 add_library(SCTP_CLIENT ${SCTP_SRC})
 target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-add_library(UDP ${OPENAIR3_DIR}/UDP/udp_eNB_task.c)
-target_link_libraries(UDP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-
 set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
 set(libnas_api_OBJS
  ${NAS_SRC}COMMON/API/NETWORK/as_message.c
@@ -1692,7 +1622,6 @@ set(libnas_ies_OBJS
  ${NAS_SRC}COMMON/IES/AuthenticationParameterAutn.c
  ${NAS_SRC}COMMON/IES/AuthenticationParameterRand.c
  ${NAS_SRC}COMMON/IES/AuthenticationResponseParameter.c
-  ${NAS_SRC}COMMON/IES/EapMessage.c
  ${NAS_SRC}COMMON/IES/CipheringKeySequenceNumber.c
  ${NAS_SRC}COMMON/IES/Cli.c
  ${NAS_SRC}COMMON/IES/CsfbResponse.c
@@ -1767,7 +1696,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
@@ -1855,11 +1784,6 @@ set(libnrnas_emm_msg_OBJS
  ${NAS_SRC}COMMON/EMM/MSG/FGSNASSecurityModeComplete.c
  ${NAS_SRC}COMMON/EMM/MSG/RegistrationComplete.c
  ${NAS_SRC}COMMON/EMM/MSG/FGSUplinkNasTransport.c
-  ${NAS_SRC}COMMON/EMM/MSG/FGSServiceRequest.c
-  ${NAS_SRC}COMMON/EMM/MSG/ActivateTestModeComplete.c
-  ${NAS_SRC}COMMON/EMM/MSG/CloseUeTestLoopComplete.c
-  ${NAS_SRC}COMMON/EMM/MSG/OpenUeTestLoopComplete.c
-  ${NAS_SRC}COMMON/EMM/MSG/DeactivateTestModeComplete.c
  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishRequest.c
  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
  ${NAS_SRC}COMMON/EMM/MSG/FGSDeregistrationRequestUEOriginating.c
@@ -1972,15 +1896,8 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
-
-#JPE
 target_link_libraries(SIMU PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES})
 target_include_directories(SIMU PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
-target_link_libraries(SIMU PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-#END
-
-
-

 # Qt-based scope
 add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
@@ -2012,8 +1929,8 @@ include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")

 add_library(oai_iqplayer MODULE
-  ${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
-  )
+	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
+	)
 set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")

 #################################
@@ -2065,18 +1982,17 @@ 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 SS_SERVER MME_APP UDP SCHED_LIB SCHED_RU_LIB
+  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_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)

 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-softmodem PRIVATE lttng-ust)
 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
@@ -2121,7 +2037,7 @@ add_executable(lte-uesoftmodem
  )

 if (NOT ${NOS1})
-  target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+	target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
 endif()
 target_link_libraries(lte-uesoftmodem PRIVATE
  -Wl,--start-group
@@ -2131,10 +2047,8 @@ target_link_libraries(lte-uesoftmodem PRIVATE
  ${NAS_UE_LIB} ITTI shlib_loader
  -Wl,--end-group z dl)

-target_link_libraries(lte-uesoftmodem PRIVATE lttng-ust)
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-uesoftmodem PRIVATE lttng-ust)
 target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2148,6 +2062,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
@@ -2163,35 +2078,31 @@ add_executable(nr-softmodem
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  )

-include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
-
 target_link_libraries(nr-softmodem PRIVATE
  -Wl,--start-group
-  UTIL HASHTABLE SCTP_CLIENT SS_SERVER 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 UDP
+  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_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 lttng-ust)
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} 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
@@ -2205,13 +2116,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
 #######################################
@@ -2219,6 +2126,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
@@ -2243,7 +2151,6 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(nr-uesoftmodem PRIVATE lttng-ust)

 add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
 if (ENABLE_LDPC_CUDA)
@@ -2307,12 +2214,12 @@ add_executable(ldpctest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
   )

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

@@ -2338,6 +2245,24 @@ target_link_libraries(nr_pbchsim PRIVATE
 )
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

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

 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
@@ -2363,7 +2288,7 @@ add_executable(nr_dlsim
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
  m pthread ${T_LIB} ITTI dl shlib_loader
  )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2402,12 +2327,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)
@@ -2469,9 +2394,9 @@ if (${T_TRACER})
        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
-        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
+        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_NR MAC_UE_NR ngap
        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals)
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc dfts)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
    endif()
@@ -2537,6 +2462,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/)
@@ -2560,19 +2488,9 @@ make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})

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

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

 ## Coding Styles ##

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

-<p align="center">
-    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/releases"><img alt="GitLab Release (custom instance)" src="https://img.shields.io/gitlab/v/release/oai/openairinterface5g?gitlab_url=https%3A%2F%2Fgitlab.eurecom.fr&include_prereleases&sort=semver"></a>
-</p>
-
 <p align="center">
    <a href="https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FRAN-Container-Parent%2F&label=build%20Images"></a>
 </p>
--- a/Sequans_USRP_setup.md
+++ b/Sequans_USRP_setup.md
@@ -1,303 +0,0 @@
-# Sequans USRP N310 Setup
-
-This document describes how to connect the USRP N310 device and build the software and run gNB.
-
-## 1 N310 Connection Options
-
-The N310 comes with 4 ports that can be used for connection to the PC.
-Note that some ports can be used for device management only while others for data streaming only.
-
-* USB Console port implements 2 serial interfaces that can be used for device management only:
-    1. The Linux console of the ARM CPU.
-    2. The console of the STM32. For example, it can be used to reboot the device remotely.
-
-    The baud rate is 115200 for both interfaces. This example shows how to connect to the Linux console (`if00` interface):
-
-        $ ls /dev/serial/by-id
-        usb-Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_007F6CB5-if00-port0
-        usb-Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_007F6CB5-if01-port0
-
-        $ sudo screen /dev/serial/by-id/usb-Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_007F6CB5-if00-port0 115200
-
-* Ethernet port provides access to the Linux console via SSH. Can be used as a management port only.
-  User `root`, no password.
-* SFP0 can be used as a data port. The port speed depends on the variant of the FPGA firmware 
-  (1Gb for the HG variant or 10Gb for the XG).
-* SFP1 is a 10 Gb port and can be used as a data port.
-
-Default network configuration:
-
-| Interface | Configuration | Configuration File           | Configuration File (old image ver.) |
-|-----------|---------------|------------------------------|-------------------------------------|
-| eth0      | dhcp          | `/data/network/eth0.network` | `/etc/systemd/network/eth0.network` |
-| sfp0      | 192.168.10.2  | `/data/network/sfp0.network` | `/etc/systemd/network/sfp0.network` |
-| sfp1      | 192.168.20.2  | `/data/network/sfp1.network` | `/etc/systemd/network/sfp1.network` |
-
-## 2 Connect N310
-
-In current setup we use 10Gb SFP1 port that is connected to the `enp1s0f0` 10Gb interface of the lab PC.
-
-1. Insert the 10Gb copper adapter to the SFP1 port and connect the port to the PC via Cat6e ethernet cable.
-2. Configure the static IP address on the interface connected to the N310:
-
-        sudo ip addr add 192.168.20.1/24 dev enp1s0f0
-
-2. Try to ping N310:
-
-        ping 192.168.20.2
-
-
-## 3 Build and Install UHD Driver
-
-UHD is a USRP host driver. We'll need its apps to update N310 firmware and libraries to build gNB.
-
-1. Install required packages.
-
-        sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils python3-mako python3-numpy python3-requests python3-ruamel.yaml python3-setuptools cmake build-essential
-
-2. Download sources.
-
-        git clone https://github.com/EttusResearch/uhd.git ~/uhd -b v4.3.0.0
-
-    Current version is 4.3.0.0.
-
-3. Build and install UHD.
-
-        cd ~/uhd/host
-        mkdir build
-        cd build
-        cmake ../
-        make -j
-
-        sudo make install
-        sudo ldconfig
-
-4. Check if UHD can find N310.
-
-        $ uhd_find_devices 
-        [INFO] [UHD] linux; GNU C++ version 9.4.0; Boost_107100; UHD_4.3.0.HEAD-0-g1f8fd345
-        --------------------------------------------------
-        -- UHD Device 0
-        --------------------------------------------------
-        Device Address:
-            serial: 327B212
-            addr: 192.168.10.2
-            claimed: False
-            mgmt_addr: 192.168.10.2
-            product: n310
-            type: n3xx
-
-## 4 Update N310 Image.
-
-It's important to update the USRP image so that it matches the UHD driver version.
-The image contains the embedded Linux file system.
-The easiest way is to update the file system via Mender.
-
-1. Download image.
-    The `uhd_images_downloader` will download the version that matches the currently installed UHD.
-
-        sudo uhd_images_downloader -t mender -t n3xx --yes -v
-
-    If the command fails, the image can be downloaded manually.
-    Check the `uhd_images_downloader` output and find the following lines:
-
-        [INFO] Using base URL: https://files.ettus.com/binaries/cache/
-        ...
-        [DEBUG] URLs to download:
-        n3xx/meta-ettus-v4.3.0.0/n3xx_common_mender_default-v4.3.0.0.zip
-
-    Combine those URLs:
-
-        wget https://files.ettus.com/binaries/cache/n3xx/meta-ettus-v4.3.0.0/n3xx_common_mender_default-v4.3.0.0.zip
-        unzip n3xx_common_mender_default-v4.3.0.0.zip
-
-2. Copy image to N310.
-    Images downloaded with `uhd_images_downloader` are located in `/usr/local/share/uhd/images/`.
-
-        scp n3xx_common_mender_default-v4.3.0.0.zip root@192.168.10.2:/home/root
-
-3. SSH into N310 and run the installation procedure.
-
-        ssh root@192.168.10.2
-
-    Note, command examples that must be executed on N310 contain `root@ni-n3xx-327B212:~#` prompt.
-
-    The installation is tricky because it depends on what Mender version is currently installed on N310.
-    First, try modern version:
-
-        root@ni-n3xx-327B212:~# mender install /home/root/usrp_n3xx_fs.mender
-    
-    If it didn't work, try to run Mender using old-style command line arguments:
-
-        root@ni-n3xx-327B212:~# mender -rootfs /home/root/usrp_n3xx_fs.mender -f
-
-4. Reboot and Validate the Installation.
-
-        root@ni-n3xx-327B212:~# reboot
-
-    After device booted, check the version:
-
-        root@ni-n3xx-327B212:~# uhd_config_info --version
-        root@ni-n3xx-327B212:~# cat /etc/mender/artifact_info
-
-    Mender uses A+B partitioning scheme, where one partition is active and another one is used for update.
-    After upgrade, the next boot runs from the newly-updated partition once.
-    However, we need to let Mender know that upgraded FS work fine. Otherwise, it will fall back to
-    the previous version after reboot:
-
-        root@ni-n3xx-327B212:~# mender -commit
-
-## 5 Update FPGA firmware
-
-1. Download FPGA firmware.
-
-        sudo uhd_images_downloader -t n310_fpga -v
-    
-    If download failes, use the same workaround as for image downloading and unzip files to UHD inventory location.
-
-        wget https://files.ettus.com/binaries/cache/n3xx/uhd-dd757ac/n3xx_n310_fpga_default-gdd757ac.zip
-        sudo unzip n3xx_n310_fpga_default-gdd757ac.zip -d /usr/local/share/uhd/images
-
-2. Update FPGA firmware
-
-        uhd_image_loader --args type=n3xx,addr=ni-n3xx-<Device_serial_addr>
-
-    where `<Device_serial_addr>` is the serial address of the USRP, which can be obtained by running `uhd_find_devices`.
-
-## 6 Build gNB with USRP support
-
-1. Install `lttng`.
-
-        sudo apt-add-repository ppa:lttng/stable-2.13
-        sudo apt update
-        sudo apt install -y lttng-tools lttng-modules-dkms  liblttng-ust-dev
-
-2. Obtain sources and install required packages.
-
-        git clone https://gitlab-shared.sequans.com/sequans/system/ttcn/firecell_sequansrd -b Latest_3GPP_FRD_299
-        cd firecell_sequansrd
-        ./FirecellRD/components/RAN/cmake_targets/build_oai -I
-
-    If build fails while installing ASN1 because `gitlab.eurecom.fr` is inaccessible,
-    configure git to use gitlab-shared.sequans.com instead:
-
-        git config --global url.https://gitlab-shared.sequans.com/sequans/system/ttcn/asn1c.insteadof https://gitlab.eurecom.fr/oai/asn1c.git
-
-3. Build gNB.
-
-        cd FirecellRD/components/RAN
-        . oaienv
-        cd cmake_targets
-        ./build_oai -I
-        ./build_oai -w USRP --ninja --nrUE --gNB --build-lib all -c
-
-## 7 Run gNB
-
-1. Run gNB (from the OAI dir):
-
-        ./cmake_targets/ran_build/build/nr-softmodem -O ci-scripts/conf_files/gNB.N78.fr1.40MHz.N310.conf --sa --usrp-tx-thread-config 1 --log_config.global_log_options wall_clock
-
-2. *Opional step, for Fibocom UE only*. Connect to the AT port:
-   Add `udev` rule for the Fibocom modem to prevent the ModemManager to interfere with the AT console.
-   Create the `/etc/udev/rules.d/99-fibocom.rules` file with following content:
-
-        ATTRS{idVendor}=="0403" ATTRS{idProduct}=="6010", ENV{ID_MM_DEVICE_IGNORE}="1"
-
-   Reload the rules:
-
-        sudo udevadm control --reload-rules
-
-   If the above method doesn't help, try to stop `ModemManager` or even to disable it:
-
-        sudo systemctl stop ModemManager
-        sudo systemctl disable ModemManager
-
-   Connect to the AT console:
-
-        sudo minicom -D /dev/serial/by-id/usb-Fibocom_Fibocom_FM160_Modem_SN:5033FA31_5033fa31-if02-port0
-
-   Check that band n78 is enabled
-
-        at+gtact?
-        +GTACT: 14,,,5078
-
-        OK
-
-   in the response we have:
-   - 14: enabled RATs, NR only.
-   - 5078: NR band n78
-
-   Set `cfun=1`:
-
-        at+cfun=1
-        OK
-
-        +SIM: Inserted
-
-        +C5GREG: 2
-
-        +CEREG: 2
-
-        +SIM READY
-
-   Check that 5G registration status changed from 0 to 2 (it may take up to half a minute):
-        
-        at+c5greg?
-        +C5GREG: 2,2
-
-        OK
-
-3. Check gNB log, it should contain the `UE State = NR_RRC_CONNECTED` message (at the end of the example below).
-
-        1692024360.127029 [NR_MAC]   Frame.Slot 128.0
-        UE RNTI c723 (1) PH 49 dB PCMAX 21 dBm, average RSRP 0 (0 meas)
-        UE c723: CQI 0, RI 1, PMI (0,0)
-        UE c723: dlsch_rounds 178/27/27/27, dlsch_errors 27, pucch0_DTX 108, BLER 0.93539 MCS 6
-        UE c723: dlsch_total_bytes 20734
-        UE c723: ulsch_rounds 177/25/25/25, ulsch_DTX 100, ulsch_errors 25, BLER 0.92023 MCS 6
-        UE c723: ulsch_total_bytes_scheduled 19373, ulsch_total_bytes_received 17356
-        UE c723: LCID 1: 3 bytes TX
-
-        1692024360.749749 [NR_PHY]   [gNB 0][RAPROC] Frame 189, slot 19 Initiating RA procedure with preamble 19, energy 46.6 dB (I0 78, thres 120), delay 7 start symbol 4 freq index 0
-        1692024360.749807 [MAC]   UL_info[Frame 189, Slot 19] Calling initiate_ra_proc RACH:SFN/SLOT:189/19
-        1692024360.749814 [NR_MAC]   Search for not existing rnti (ignore for RA): 37d2
-        1692024360.749816 [NR_MAC]   [gNB 0][RAPROC] CC_id 0 Frame 189 Activating Msg2 generation in frame 190, slot 7 using RA rnti 10f SSB, new rnti 37d2 index 0 RA index 0
-        1692024360.750433 [NR_MAC]   [gNB 0][RAPROC] CC_id 0 Frame 190, slotP 7: Generating RA-Msg2 DCI, rnti 0x10f, state 1, CoreSetType 2
-        1692024360.750449 [NR_MAC]   [RAPROC] Msg3 slot 17: current slot 7 Msg3 frame 190 k2 7 Msg3_tda_id 3
-        1692024360.750456 [NR_MAC]   [gNB 0][RAPROC] Frame 190, Subframe 7: rnti 37d2 RA state 2
-        1692024360.758679 [NR_MAC]   Search for not existing rnti (ignore for RA): 37d2
-        1692024360.758684 [NR_MAC]   Adding UE with rnti 0x37d2
-        1692024360.759265 [NR_MAC]   [gNB 0][RAPROC] PUSCH with TC_RNTI 0x37d2 received correctly, adding UE MAC Context RNTI 0x37d2
-        1692024360.759271 [NR_MAC]   [RAPROC] RA-Msg3 received (sdu_lenP 7)
-        1692024360.759275 [RLC]   activated srb0 for UE with RNTI 0x37d2
-        1692024360.759279 [MAC]   [RAPROC] Received SDU for CCCH length 6 for UE 37d2
-        1692024360.759344 [NR_MAC]   Activating scheduling RA-Msg4 for TC_RNTI 0x37d2 (state 2)
-        1692024360.759346 [NR_MAC]   Unexpected ULSCH HARQ PID 0 (have -1) for RNTI 0x37d2 (ignore this warning for RA)
-        1692024360.759353 [RRC]   initial UL RRC message nr_cellid 0 does not match RRC's 12345678
-        1692024360.759379 [NR_RRC]   Decoding CCCH: RNTI 37d2, inst 0, payload_size 6
-        1692024360.759655 [NR_RRC]   rrc_gNB_generate_RRCSetup for RNTI 37d2
-        1692024360.759700 [PDCP]   nr_pdcp_entity_set_security: rb_id=1 INT=0, CIP=0
-        1692024360.759737 [NR_MAC]   Adding SchedulingRequestconfig
-        1692024360.759739 [NR_MAC]   Adding BSR config
-        1692024360.759741 [NR_MAC]   Adding TAG config
-        1692024360.759741 [NR_MAC]   Adding PHR config
-        1692024360.759757 [RLC]   /home/labo/dev/lmeyer/ttcn/openairinterface5g/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c:961:add_rlc_srb: added srb 1 to UE with RNTI 0x37d2
-        1692024360.759986 [NR_MAC]   ( 191. 6) SRB0 has 136 bytes
-        1692024360.760019 [NR_MAC]   Generate msg4, rnti: 37d2
-        1692024360.760022 [NR_MAC]   Encoded RRCSetup Piggyback (136 + 2 bytes), mac_pdu_length 145
-        1692024360.764081 [NR_MAC]   (UE RNTI 0x37d2) Received Ack of RA-Msg4. CBRA procedure succeeded!
-        1692024360.764089 [NR_MAC]   (191.14) Activating RRC processing timer for UE 37d2 with 10 ms
-        1692024360.774173 [NR_MAC]   (192.14) De-activating RRC processing timer for UE 37d2
-        1692024360.774260 [NR_MAC]   Modified rnti 37d2 with CellGroup
-        1692024360.774263 [NR_MAC]   Adding SchedulingRequestconfig
-        1692024360.774264 [NR_MAC]   Adding BSR config
-        1692024360.774268 [NR_MAC]   Adding TAG config
-        1692024360.774269 [NR_MAC]   Adding PHR config
-        1692024360.918633 [PDCP]   nr_pdcp_entity_recv_pdu: Entity security status(0): ciphering -1, integrity check -1
-        1692024360.918692 [PDCP]   RLC => PDCP: rcvd_count=0, rcvd_sn=0: 00 00 10 00 05 df 80 10 5e 40 03 40 40 be 0a 7c 3f c0 00 04 00 00 04 65 cb 80 bc 1c 00 00 00 00 00 
-        1692024360.918698 [PDCP]   nr_pdcp_entity_recv_pdu: deciphering did not apply
-        1692024360.918813 [NR_RRC]   [FRAME 00000][gNB][MOD 00][RNTI 37d2] RLC RB 01 --- RLC_DATA_IND 27 bytes (RRCSetupComplete) ---> RRC_gNB
-        1692024360.918821 [NR_RRC]   [FRAME 00000][gNB][MOD 00][RNTI 37d2] [RAPROC] Logical Channel UL-DCCH, processing NR_RRCSetupComplete from UE (SRB1 Active)
-        1692024360.918826 [NR_RRC]   [FRAME 00000][gNB][MOD 00][RNTI 37d2] UE State = NR_RRC_CONNECTED 
-        1692024360.918833 [NGAP]   No AMF is associated to the gNB
-
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -31,9 +31,6 @@ def do5Gtest = false
 //
 def gitCommitAuthorEmailAddr

-// list of failing stages
-def failingStages = ""
-
 pipeline {
  agent {
    label nodeExecutor
@@ -106,6 +103,7 @@ pipeline {
            gitCommitAuthorEmailAddr = sh returnStdout: true, script: 'git log -n1 --pretty=format:%ae ${GIT_COMMIT}'
            gitCommitAuthorEmailAddr = gitCommitAuthorEmailAddr.trim()
            echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
+            sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"
          }
        }
      }
@@ -120,49 +118,44 @@ pipeline {
      }
    }
    // Build Stages are Mandatory
+    // Later we will add a Ubuntu20 build
    stage ("Image Building Processes") {
      when { expression {doBuild} }
      parallel {
-        stage ("Ubuntu-Image-Builder") {
+        stage ("Ubuntu18-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu-Image-Builder')
+              triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuBuildStatus = finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
+                finalizeSlaveJob('RAN-Ubuntu18-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuBuildStatus
              }
            }
          }
        }
-        stage ("RHEL-Cluster-Image-Builder") {
+        stage ("RHEL8-Cluster-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL-Cluster-Image-Builder')
+              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL8-Cluster-Image-Builder')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rhelBuildStatus = finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
+                finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rhelBuildStatus
              }
            }
          }
@@ -176,37 +169,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                cppcheckStatus = finalizeSlaveJob('RAN-cppcheck')
+                finalizeSlaveJob('RAN-cppcheck')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += cppcheckStatus
-              }
-            }
-          }
-        }
-        stage ("ARM-Cross-Compile") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-ARM-Cross-Compile-Builder', 'ARM-Cross-Compilation')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                armBuildStatus = finalizeSlaveJob('RAN-ARM-Cross-Compile-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += armBuildStatus
              }
            }
          }
@@ -226,15 +194,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                physimStatus = finalizeSlaveJob('RAN-PhySim-Cluster')
+                finalizeSlaveJob('RAN-PhySim-Cluster')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += physimStatus
              }
            }
          }
@@ -249,15 +214,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim4GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-4G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-4G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim4GStatus
              }
            }
          }
@@ -272,15 +234,12 @@ pipeline {
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                rfSim5GStatus = finalizeSlaveJob('RAN-RF-Sim-Test-5G')
+                finalizeSlaveJob('RAN-RF-Sim-Test-5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += rfSim5GStatus
              }
            }
          }
@@ -295,15 +254,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,38 +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
              }
            }
          }
@@ -566,21 +468,18 @@ pipeline {
          when { expression {do5Gtest} }
          steps {
            script {
-              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'SA-OAIUE-CN5G')
+              triggerSlaveJob ('RAN-SA-OAIUE-CN5G', 'RAN-SA-OAIUE-CN5G')
            }
          }
          post {
            always {
              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saOAIUEStatus = finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
+                finalizeSlaveJob('RAN-SA-OAIUE-CN5G')
              }
            }
            failure {
              script {
                currentBuild.result = 'FAILURE'
-                failingStages += saOAIUEStatus
              }
            }
          }
@@ -599,13 +498,30 @@ pipeline {
          script {
            echo "Push to Docker-Hub KO"
            currentBuild.result = 'FAILURE'
-            failingStages += '\n * RAN-DockerHub-Push'
          }
        }
      }
    }
  }
  post {
+    always {
+      script {
+        def eSubject = JOB_NAME + ' - Build # ' + BUILD_ID + ' - ' + currentBuild.result + '!'
+        def eBody = "Hi,\n\n"
+        eBody += "Here are attached HTML report files for " + JOB_NAME + "  - Build # " + BUILD_ID + " - " + currentBuild.result + "!\n\n"
+        eBody += "Regards,\n"
+        eBody += "OAI CI Team"
+        emailext attachmentsPattern: '*results*.html',
+           body: eBody,
+           replyTo: 'no-reply@openairinterface.org',
+           subject: eSubject,
+           to: gitCommitAuthorEmailAddr
+
+        if (fileExists('.git/CI_COMMIT_MSG')) {
+          sh "rm -f .git/CI_COMMIT_MSG"
+        }
+      }
+    }
    success {
      script {
        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
@@ -623,8 +539,7 @@ pipeline {
      script {
        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
        if ("MERGE".equals(env.gitlabActionType)) {
-          def fullMessage = message + '\n\nList of failing test stages:' + failingStages
-          addGitLabMRComment comment: fullMessage
+          addGitLabMRComment comment: message
          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
          sendSocialMediaMessage('ci-enb', 'danger', message2)
        } else {
@@ -672,7 +587,6 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
  if ("MERGE".equals(env.gitlabActionType)) {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
    shortenShaOne = shortenShaOne.trim()
-    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
  } else {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
@@ -727,29 +641,21 @@ def triggerSlaveJobNoGitLab (jobName) {
 }

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

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

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

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

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

    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -54,13 +54,6 @@ pipeline {
        lock(extra: lockResources)
    }
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -66,14 +66,32 @@ pipeline {
        ansiColor('xterm')
        lock(extra: lockResources)
    }
+    // the following parameter options are commented out so it shows the ones
+    // that you SHALL have to run the job.
+    // You can use them as template
+    /*
+    parameters {
+        //node-test parameters
+        string(name: 'pythonExecutor', defaultValue: 'nodea', description: 'Node where the pipeline - python scripts will be executed')
+        string(name: 'pythonTestXmlFile', defaultValue: 'enb_usrpB210_band7_50PRB.xml', description: 'Location of the Test XML to be run')
+        string(name: 'pipelineTestStageName', defaultValue: 'Test COTS-UE - OAI eNB - LTEBOX EPC', description: 'Naming of the Test Stage')
+        booleanParam(name: 'pipelineZipsConsoleLog', defaultValue: 'True', description: 'If true, the pipeline script retrieves the job console log, zips it and archives it as artifact')
+        string(name: 'lockResources', defaultValue: 'CI-Bench-1-Phones', description: 'Lockeable Resource to prevent multiple jobs to run simultaneously with the same resource')
+
+        //eNB parameters
+        string(name: 'eNB_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of eNB')
+        credentials(name: 'eNB_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for eNB')
+        string(name: 'eNB_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of eNB source code')
+
+        //EPC parameters
+        string(name: 'EPC_IPAddress', defaultValue: '192.168.XX.XX', description: 'IP Address of EPC')
+        string(name: 'EPC_Type', defaultValue: 'ltebox', description: 'EPC type: OAI or ltebox')
+        credentials(name: 'EPC_Credentials', defaultValue: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', credentialType: "Username with password", required: true, description: 'Credentials for EPC')
+        string(name: 'EPC_SourceCodePath', defaultValue: '/tmp/CI-enb', description: 'Full path of EPC source code')
+    }
+    */
+
    stages {
-        stage("Build Init") {
-            steps {
-                // update the build name and description
-                buildName "${params.eNB_MR}"
-                buildDescription "Branch : ${params.eNB_Branch}"
-            }
-        }
        stage ("Verify Parameters") {
            steps {
                script {
--- a/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
@@ -1,281 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000100",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000102",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000103",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000104",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000110",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000105",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000106",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000107",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000108",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000109",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/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
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -1,380 +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
-
-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-20897-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
-
-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
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -0,0 +1,199 @@
+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
+  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_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
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -132,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -266,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
@@ -418,6 +412,7 @@ class Cluster:
 		imageSize = {}
 		for image in attemptedImages:
 			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
+			self.cmd.run(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log')
 			tag = imageTag if image != 'ran-base' else baseTag
 			size = self._get_image_size(image, tag)
 			if size <= 0:
--- a/ci-scripts/cls_cmd.py
+++ b/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()
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']

 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -97,9 +97,7 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 def ImageTagToUse(imageName, ranCommitID, ranBranch, ranAllowMerge):
 	shortCommit = ranCommitID[0:8]
 	if ranAllowMerge:
-		# Allowing contributor to have a name/branchName format
-		branchName = ranBranch.replace('/','-')
-		tagToUse = f'{branchName}-{shortCommit}'
+		tagToUse = f'{ranBranch}-{shortCommit}'
 	else:
 		tagToUse = f'develop-{shortCommit}'
 	fullTag = f'{imageName}:{tagToUse}'
@@ -155,13 +153,17 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 			committed = False
 			tagged = False
 			with open(f'{buildRoot}/{image}.log', mode='r') as inputfile:
+				startOfTargetImageCreation = False # check for tagged/committed only after image created
 				for line in inputfile:
-					lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
-					lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
-					tagged = tagged or lineHasTag or lineHasTag2
-					# the OpenShift Cluster builder prepends image registry URL
-					lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
-					committed = committed or lineHasCommit
+					result = re.search(f'FROM .* [aA][sS] {image}$', str(line))
+					if result is not None:
+						startOfTargetImageCreation = True
+					if startOfTargetImageCreation:
+						lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
+						tagged = tagged or lineHasTag
+						# the OpenShift Cluster builder prepends image registry URL
+						lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
+						committed = committed or lineHasCommit
 			errorandwarnings['errors'] = 0 if committed or tagged else 1
 			errorandwarnings['warnings'] = 0
 			errorandwarnings['status'] = committed or tagged
@@ -169,6 +171,97 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo

+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)
+
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -198,7 +291,6 @@ class Containerize():
 		self.proxyCommit = None
 		self.eNB_instance = 0
 		self.eNB_serverId = ['', '', '']
-		self.deployKind = [True, True, True]
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.nb_healthy = [0, 0, 0]
@@ -266,41 +358,34 @@ class Containerize():
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
 			self.dockerfileprefix = '.ubuntu20'
-			self.cliBuildOptions = ''
+			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--disable-compression'
+			self.cliBuildOptions = '--no-cache --disable-compression'

 		# we always build the ran-build image with all targets
-		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
-		imageNames = [('ran-build', 'build', 'ran-build', '')]
+		imageNames = [('ran-build', 'build')]
 		result = re.search('eNB', self.imageKind)
+		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
 		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-		result = re.search('gNB', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-		result = re.search('all', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
-			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
-			if self.host == 'Red Hat':
-				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
-			if self.host == 'Ubuntu':
-				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
-				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"'))
-		result = re.search('build_cross_arm64', self.imageKind)
-		if result is not None:
-			self.dockerfileprefix = '.ubuntu20.cross-arm64'
+			imageNames.append(('oai-enb', 'eNB'))
+		else:
+			result = re.search('gNB', self.imageKind)
+			if result is not None:
+				imageNames.append(('oai-gnb', 'gNB'))
+			else:
+				result = re.search('all', self.imageKind)
+				if result is not None:
+					imageNames.append(('oai-enb', 'eNB'))
+					imageNames.append(('oai-gnb', 'gNB'))
+					imageNames.append(('oai-nr-cuup', 'nr-cuup'))
+					imageNames.append(('oai-lte-ue', 'lteUE'))
+					imageNames.append(('oai-nr-ue', 'nrUE'))
+					if self.host == 'Red Hat':
+						imageNames.append(('oai-physim', 'phySim'))
+					if self.host == 'Ubuntu':
+						imageNames.append(('oai-lte-ru', 'lteRU'))
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -329,23 +414,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}")
@@ -353,13 +434,13 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
+			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
 			cmd.run(f"{self.cli} image prune --force")
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -379,61 +460,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 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.2023.11.28.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.2023.11.28.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}")
+		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)
@@ -446,13 +511,12 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)

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

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

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

@@ -580,107 +644,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 = 'develop'
-		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
-		if ret.returncode != 0:
-			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
-		if ret.returncode != 0:
-			logging.error(f'Cannot build unit tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
-
-		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:develop')
-		build_log_name = f'build_log_{self.testCase_id}'
-		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
-		cmd.close()
-
-		if ret.returncode == 0:
-			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
-			HTML.CreateHtmlTabFooter(True)
-			return True
-		else:
-			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
-			HTML.CreateHtmlTabFooter(False)
-			return False
+		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':
@@ -716,11 +695,10 @@ class Containerize():
 		orgTag = 'develop'
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
-		for image in IMAGES:
+		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
+		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
-			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
-				continue
 			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
@@ -764,7 +742,6 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
 		myCmd = cls_cmd.getConnection(lIpAddr)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
@@ -855,7 +832,6 @@ class Containerize():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
-		self.deployKind[self.eNB_instance] = True

 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -873,12 +849,12 @@ class Containerize():
 		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
 		grep = ''
-		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
+		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
@@ -926,8 +902,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|Waiting for RUs to be configured', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -935,6 +911,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
@@ -979,87 +956,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}')
-			running = ret.stdout.splitlines()
+			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 ret.stdout != "" and ret.returncode == 0: # something is running for that service
+			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
+		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'{svcName}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
-			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res
+			#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 'oai-nr-ue' in services or 'lte_ue0' in services:
+		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 svcName in services:
-				if svcName == 'nv-cubb':
-					msg = 'Undeploy PNF/Nvidia CUBB'
-					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
+				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'{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:
-						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:
@@ -1081,16 +1058,6 @@ class Containerize():
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			# In the scenario, for 5G images, we have the choice of either pulling normal images
-			# or -asan images. We need to detect which kind we did pull.
-			if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
-				ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False, silent=self.displayedNewTags)
-				if ret.returncode != 0:
-					tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan')
-					tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan')
-					tagToUse = tagToUse.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
-					if not self.displayedNewTags:
-						logging.debug(f'\u001B[1m Using sanitized version of {image} with {tagToUse}\u001B[0m')
 			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True
@@ -1229,7 +1196,12 @@ class Containerize():
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd)
+		myCmd.run(cmd, silent=self.displayedNewTags)
+		for image in IMAGES:
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
+			myCmd.run(cmd, silent=self.displayedNewTags)
+		self.displayedNewTags = True

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

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

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

 		if fullStatus:
@@ -1375,6 +1349,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()
--- a/ci-scripts/cls_module_ue.py
+++ b/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 ""

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

--- a/ci-scripts/conf_files/3GPP_System_Simulator/FC_CI_SS_proxy_rcc.band1_1CC.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/FC_CI_SS_proxy_rcc.band1_1CC.tm1.nfapi.conf
@@ -1,227 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// Identification parameters:
-    eNB_ID    =  0x1;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // 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:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type					      = "FDD";
-        tdd_config 					      = 0;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 1;
-        downlink_frequency      			      = 2160000000L;
-        uplink_frequency_offset 			      = -200000000L;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 22;
-      prach_config_index      			      = 3;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 5;
-      prach_freq_offset       			      = 4;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.4";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDRESS";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-# IP Address, port numbers and SSMode for System Simulator
-SSConfig = (
-   {
-        hostIp = "127.0.0.1"; #Host IP for System Simulator
-        Sys_port = 7777; #Port Number for System Simulator Sys Port
-        Srb_port = 7778; #Port Number for System Simulator Srb Port
-        Vng_port = 7779; #Port Number for System Simulator VNG Port
-        Vtp_port = 7780; #Port Number for System Simulator VTP Port
-        Drb_port = 7781; #Port Number for System Simulator DRB Port
-        SysInd_port = 7782; #Port Number for System Simulator SysIND Port
-        SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-        #scheduler_mode = "fairRR";
-        }
-);
-
-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_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config =
-    {
-      global_log_level                       ="info";
-      pkt_log_level                          ="debug";
-      #global_log_verbosity                  ="low";
-      #hw_log_level                          ="error";
-      #hw_log_verbosity                      ="low";
-      #phy_log_level                         ="error";
-      #phy_log_verbosity                     ="low";
-      mac_log_level                          ="info";
-      #mac_log_verbosity                     ="low";
-      #rlc_log_level                         ="warn";
-      #rlc_log_verbosity                     ="low";
-      #pdcp_log_level                        ="analysis";
-      #pdcp_log_verbosity                    ="low";
-      rrc_log_level                          ="info";
-      #rrc_log_verbosity                     ="full";
-   };
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_gnb.n78.fr1.40mhz.n310.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_gnb.n78.fr1.40mhz.n310.conf
@@ -1,302 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-  # nr_cellid = 0L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 0;  
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 12;
-    searchSpaceZero = 10;
-  });
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 623424;#621312;
-      dl_frequencyBand                      = 78;
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  622152; #620040;
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;
-      dl_carrierBandwidth                   = 106;
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 28875;
-        # 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                     = 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-    #GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    #GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "127.0.0.1"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "127.0.0.1"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "127.0.0.1"; #Host for System Simulator VNG Port
-  #  Vtp_port = 7780; #Port Number for System Simulator VTP Port
-  #  Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "127.0.0.1"; #Host for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 100;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 28;
-  #dl_harq_round_max = 1;
-  #ul_harq_round_max = 1;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "mgmt_addr=192.168.20.2,addr=192.168.20.2,clock_source=internal,time_source=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";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
-};
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.106PRB.usrpn310.conf
@@ -1,265 +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  =  0xa000;
-    plmn_list = ({
-                  mcc = 001;
-                  mnc = 01;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 2;
-                      sd  = 0xffffff; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    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                               = 12952; # 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                            = 12952;
-# 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 :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-);
-
-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                      ="error";
-#       pkt_log_level                         ="info";
-#       hw_log_level                          ="info";
-#       phy_log_level                         ="info";
-       mac_log_level                         ="analysis";
-#       rlc_log_level                         ="info";
-#       pdcp_log_level                        ="info";
-#       rrc_log_level                         ="info";
-#       nr_rrc_log_level                      ="info";
-#       ngap_log_level                        ="debug";
-    };
-
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.10MHZ.lowest.usrpn310.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.10MHZ.lowest.usrpn310.conf
@@ -1,258 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-  # nr_cellid = 0L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 18;  
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 2;
-    searchSpaceZero = 0;
-  });
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 620352;        # SSB center frequency: 3305.28 MHz
-      dl_frequencyBand                      = 78;
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  620046;           # OffsetToPointA=4   # POint A = 3300.69 and kssb=18    
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;
-      dl_carrierBandwidth                   = 24; #config shall be 24 PRBs for 10MHZ but OAI does not support 24 PRB
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 6325;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                   = 1;
-
-      # pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                = 2;
-      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                               = 24; #config shall be 24 PRBs for 10MHZ but OAI does not support 24 PRB 
-      pMax                                              = 20;
-
-      # initialUplinkBWP
-        # genericParameters
-        initialULBWPlocationAndBandwidth                = 6325;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                   = 1;
-
-        # rach-ConfigCommon
-          # rach-ConfigGeneric
-          prach_ConfigurationIndex                      = 159;
-          # prach_msg1_FDM
-          # 0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                = 0;
-          prach_msg1_FrequencyStart                     = 0;
-          zeroCorrelationZoneConfig                     = 15;
-          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  = 4;
-          # one (0..15) 4,8,12,16,...60,64
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 15;
-          # ra_ContentionResolutionTimer
-          # (0..7) 8,16,24,32,40,48,56,64
-          ra_ContentionResolutionTimer                  = 7;
-          rsrp_ThresholdSSB                             = 19;
-          # prach-RootSequenceIndex_PR
-          # 1 = 839, 2 = 139
-          prach_RootSequenceIndex_PR                    = 2;
-          prach_RootSequenceIndex                       = 1;
-          # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-          msg1_SubcarrierSpacing                        = 1,
-          # restrictedSetConfig
-          # 0=unrestricted, 1=restricted type A, 2=restricted type B
-          restrictedSetConfig                           = 0,
-          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   = 2;                                     # SSB index=1 (SIB 1 is in slot 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-    #GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    #GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-);
-
-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                      ="debug";
-  pkt_log_level="debug";
-  #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                        ="info";
-};
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.10MHZ.similar.100MHZ.usrpn310.conf.NOTTESTED
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.10MHZ.similar.100MHZ.usrpn310.conf.NOTTESTED
@@ -1,302 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-  # nr_cellid = 0L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 6;  
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 2;
-    searchSpaceZero = 0;
-  });
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 620352;        # SSB center frequency: 3305.28 MHz
-      dl_frequencyBand                      = 78;
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  620058;           # OffsetToPointA=4   # POint A = 3300.87 and kssb=6 
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;
-      dl_carrierBandwidth                   = 48; #24
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 6325;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                   = 1;
-
-      # pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                = 2;
-      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                               = 48; #24;
-      pMax                                              = 20;
-
-      # initialUplinkBWP
-        # genericParameters
-        initialULBWPlocationAndBandwidth                = 6325;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                   = 1;
-
-        # rach-ConfigCommon
-          # rach-ConfigGeneric
-          prach_ConfigurationIndex                      = 159;
-          # prach_msg1_FDM
-          # 0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                = 0;
-          prach_msg1_FrequencyStart                     = 0;
-          zeroCorrelationZoneConfig                     = 15;
-          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  = 4;
-          # one (0..15) 4,8,12,16,...60,64
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 15;
-          # ra_ContentionResolutionTimer
-          # (0..7) 8,16,24,32,40,48,56,64
-          ra_ContentionResolutionTimer                  = 7;
-          rsrp_ThresholdSSB                             = 19;
-          # prach-RootSequenceIndex_PR
-          # 1 = 839, 2 = 139
-          prach_RootSequenceIndex_PR                    = 2;
-          prach_RootSequenceIndex                       = 1;
-          # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-          msg1_SubcarrierSpacing                        = 1,
-          # restrictedSetConfig
-          # 0=unrestricted, 1=restricted type A, 2=restricted type B
-          restrictedSetConfig                           = 0,
-          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   = 2;                                     # SSB index=1 (SIB 1 is in slot 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-    #GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    #GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "127.0.0.1"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "127.0.0.1"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "127.0.0.1"; #Host for System Simulator VNG Port
-  #  Vtp_port = 7780; #Port Number for System Simulator VTP Port
-  #  Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "127.0.0.1"; #Host for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 100;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 28;
-  #dl_harq_round_max = 1;
-  #ul_harq_round_max = 1;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "mgmt_addr=192.168.20.2,addr=192.168.20.2,clock_source=internal,time_source=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";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
-};
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_1CC.sa.fr1.conf
@@ -1,268 +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  =  0xa000;
-    plmn_list = ({
-                  mcc = 001;
-                  mnc = 01;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    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                               = 12952; # 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                            = 12952;
-# 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 :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.61.195";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "127.0.0.1"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "127.0.0.1"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "127.0.0.1"; #Host for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "127.0.0.1"; #Host for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-);
-
-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                      ="error";
-#       pkt_log_level                         ="info";
-#       hw_log_level                          ="info";
-       phy_log_level                         ="debug";
-       mac_log_level                         ="debug";
-	nr_mac_log_level	             ="debug";
-       rlc_log_level                         ="debug";
-       pdcp_log_level                        ="debug";
-#       rrc_log_level                         ="info";
-       nr_rrc_log_level                      ="info";
-#      gnb_app_log_level                      ="debug";
-#       ngap_log_level                        ="debug";
-    };
-
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_2CC.sa.fr1.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_gnb.band78_2CC.sa.fr1.conf
@@ -1,377 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-     pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      },
-      {
-        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                               = 12952; # 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                            = 12952;
-# 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;
-  },
-  {
- #spCellConfigCommon
-
-      physCellId                                                    = 1;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 641281;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640009;
-      #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                               = 12952; # 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                            = 12952;
-# 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 :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp2s0"; //BOND0
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.253.70"; //IP-Address of BOND0
-        GNB_INTERFACE_NAME_FOR_NGU               = "enp2s0"; //BOND0
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.253.70"; //IP-Address of BOND0
-        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-        {
-        num_cc = 2;
-        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
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-);
-
-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";
-       pkt_log_level                         ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       nr_phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       nr_mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       nr_rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       nr_pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       nr_rrc_log_level                         ="info";
-       ngap_log_level                         ="info";
-    };
-
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_nr-ue.nfapi.conf
@@ -1,37 +0,0 @@
-log_config = {
-  global_log_level                      ="info";
-  hw_log_level                          ="error";
-  nr_phy_log_level                         ="debug";
-  mac_log_level                         ="error";
-  nr_mac_log_level                      ="debug";
-  rlc_log_level                         ="debug";
-  pdcp_log_level                        ="debug";
-  rrc_log_level                         ="debug";
-  nr_rrc_log_level                      ="debug";
-  nas_log_level 			="debug";
- sdap_log_level				="debug";
-};
-
-uicc0 = {
-imsi = "001010123456063";
-key = "000102030405060708090A0B0C0D0E0F";
-opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=0xffffff;
-use_milenage = 0;
-}
-
-MACRLCs = (
-        {
-        num_cc = 1;
-        tr_n_preference = "nfapi";
-        local_n_if_name  = "lo:";
-        remote_n_address = "127.0.0.1"; //Proxy IP
-        local_n_address  = "127.0.0.1";
-        local_n_portc    = 50600;
-        remote_n_portc   = 50601;
-        local_n_portd    = 50610;
-        remote_n_portd   = 50611;
-        }
-);
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_1CC.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_1CC.tm1.nfapi.conf
@@ -1,233 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// Identification parameters:
-    eNB_ID    =  0x1;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // 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:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type					      = "FDD";
-        tdd_config 					      = 0;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 1;
-        downlink_frequency      			      = 2160000000L;
-        uplink_frequency_offset 			      = -200000000L;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 22;
-      prach_config_index      			      = 3;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 5;
-      prach_freq_offset       			      = 4;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.4";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDRESS";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-# IP Address, port numbers and SSMode for System Simulator
-SSConfig = (
-   {
-        hostIp = "127.0.0.1"; #Host IP for System Simulator
-        Sys_port = 7777; #Port Number for System Simulator Sys Port
-        Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-        Srb_port = 7778; #Port Number for System Simulator Srb Port
-        Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-        Vng_port = 7779; #Port Number for System Simulator VNG Port
-        Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-        Vtp_port = 7780; #Port Number for System Simulator VTP Port
-        Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-        Drb_port = 7781; #Port Number for System Simulator DRB Port
-        Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-        SysInd_port = 7782; #Port Number for System Simulator SysIND Port
-        SysInd_host =  "/tmp/eNBSysInd.pipe"; #Host for System Simulator DRB Port
-        SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-        #scheduler_mode = "fairRR";
-        }
-);
-
-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_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config =
-    {
-      global_log_level                       ="error";
-      pkt_log_level                          ="info";
-      #global_log_verbosity                  ="low";
-      #hw_log_level                          ="error";
-      #hw_log_verbosity                      ="low";
-      #phy_log_level                         ="error";
-      #phy_log_verbosity                     ="low";
-      #mac_log_level                          ="info";
-      #mac_log_verbosity                     ="low";
-      #rlc_log_level                         ="warn";
-      #rlc_log_verbosity                     ="low";
-      #pdcp_log_level                        ="analysis";
-      #pdcp_log_verbosity                    ="low";
-      #rrc_log_level                          ="info";
-      #rrc_log_verbosity                     ="full";
-   };
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_2CC.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_2CC.tm1.nfapi.conf
@@ -1,329 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// Identification parameters:
-    eNB_ID    =  0x1;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // 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:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type					      = "FDD";
-        tdd_config 					      = 0;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 1;
-        downlink_frequency      			      = 2160000000L;
-        uplink_frequency_offset 			      = -200000000L;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 22;
-      prach_config_index      			      = 3;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 5;
-      prach_freq_offset       			      = 4;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-      },
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type                                            = "FDD";
-        tdd_config                                            = 0;
-        tdd_config_s                                          = 0;
-        prefix_type                                           = "NORMAL";
-        eutra_band                                            = 1;
-        downlink_frequency                                    = 2150000000L;
-        uplink_frequency_offset                               = -200000000L;
-      Nid_cell                                        = 1;
-      N_RB_DL                                         = 50;
-      Nid_cell_mbsfn                                  = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx                                  = 1;
-      nb_antennas_rx                                  = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root                                      = 22;
-      prach_config_index                              = 3;
-      prach_high_speed                                = "DISABLE";
-      prach_zero_correlation                          = 5;
-      prach_freq_offset                               = 4;
-      pucch_delta_shift                               = 1;
-      pucch_nRB_CQI                                   = 0;
-      pucch_nCS_AN                                    = 0;
-      pucch_n1_AN                                     = 0;
-      pdsch_referenceSignalPower                              = -27;
-      pdsch_p_b                                               = 0;
-      pusch_n_SB                                              = 1;
-      pusch_enable64QAM                                       = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled                               = "ENABLE";
-      pusch_groupAssignment                                   = 0;
-      pusch_sequenceHoppingEnabled                            = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b                           = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff                            = 2;
-      ue_TimersAndConstants_t300                              = 1000;
-      ue_TimersAndConstants_t301                              = 1000;
-      ue_TimersAndConstants_t310                              = 1000;
-      ue_TimersAndConstants_t311                              = 10000;
-      ue_TimersAndConstants_n310                              = 20;
-      ue_TimersAndConstants_n311                              = 1;
-      ue_TransmissionMode                                    = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.4";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDRESS";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-# IP Address, port numbers and SSMode for System Simulator
-SSConfig = (
-   {
-        hostIp = "127.0.0.1"; #Host IP for System Simulator
-        Sys_port = 7777; #Port Number for System Simulator Sys Port
-        Srb_port = 7778; #Port Number for System Simulator Srb Port
-        Vng_port = 7779; #Port Number for System Simulator VNG Port
-        Vtp_port = 7780; #Port Number for System Simulator VTP Port
-        Vtp_host = "127.0.0.1"; #Host for System Simulator VTP Port
-        Drb_port = 7781; #Port Number for System Simulator DRB Port
-        SysInd_port = 7782; #Port Number for System Simulator SysIND Port
-        SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-	{
-	num_cc = 2;
-	local_s_if_name  = "lo";
-	remote_s_address = "127.0.0.1";
-	local_s_address  = "127.0.0.1";
-	local_s_portc    = 50001;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-        #scheduler_mode = "fairRR";
-        }
-);
-
-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_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-#log_config =
-#    {
-#      global_log_level                      ="debug";
-#      global_log_verbosity                  ="low";
-#      hw_log_level                          ="error";
-#      hw_log_verbosity                      ="low";
-#      phy_log_level                         ="debug";
-#      phy_log_verbosity                     ="low";
-#      mac_log_level                         ="analysis";
-#      mac_log_verbosity                     ="low";
-#      rlc_log_level                         ="warn";
-#      rlc_log_verbosity                     ="low";
-#      pdcp_log_level                        ="analysis";
-#      pdcp_log_verbosity                    ="low";
-#      rrc_log_level                         ="analysis";
-#      rrc_log_verbosity                     ="full";
-#   };
-
-log_config =
-    {
-      global_log_level                      ="error";
-      pkt_log_level                         ="info";
-      #global_log_verbosity                  ="low";
-      #hw_log_level                          ="error";
-      #hw_log_verbosity                      ="low";
-      #phy_log_level                         ="error";
-      #phy_log_verbosity                     ="low";
-      mac_log_level                         ="info";
-      #mac_log_verbosity                     ="low";
-      #rlc_log_level                         ="warn";
-      #rlc_log_verbosity                     ="low";
-      #pdcp_log_level                        ="analysis";
-      #pdcp_log_verbosity                    ="low";
-      rrc_log_level                         ="info";
-      #rrc_log_verbosity                     ="full";
-   };
-
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_3CC.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band1_3CC.tm1.nfapi.conf
@@ -1,416 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    # real_time choice in {hard, rt-preempt, no}
-    real_time       =  "no";
-
-    ////////// Identification parameters:
-    eNB_ID    =  0x1;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // 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:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type					      = "FDD";
-        tdd_config 					      = 0;
-        tdd_config_s            			      = 0;
-        prefix_type             			      = "NORMAL";
-        eutra_band              			      = 1;
-        downlink_frequency      			      = 2160000000L;
-        uplink_frequency_offset 			      = -200000000L;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 22;
-      prach_config_index      			      = 3;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 5;
-      prach_freq_offset       			      = 4;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-      },
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type                                            = "FDD";
-        tdd_config                                            = 0;
-        tdd_config_s                                          = 0;
-        prefix_type                                           = "NORMAL";
-        eutra_band                                            = 1;
-        downlink_frequency                                    = 2150000000L;
-        uplink_frequency_offset                               = -200000000L;
-      Nid_cell                                        = 1;
-      N_RB_DL                                         = 50;
-      Nid_cell_mbsfn                                  = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx                                  = 1;
-      nb_antennas_rx                                  = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root                                      = 22;
-      prach_config_index                              = 3;
-      prach_high_speed                                = "DISABLE";
-      prach_zero_correlation                          = 5;
-      prach_freq_offset                               = 4;
-      pucch_delta_shift                               = 1;
-      pucch_nRB_CQI                                   = 0;
-      pucch_nCS_AN                                    = 0;
-      pucch_n1_AN                                     = 0;
-      pdsch_referenceSignalPower                              = -27;
-      pdsch_p_b                                               = 0;
-      pusch_n_SB                                              = 1;
-      pusch_enable64QAM                                       = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled                               = "ENABLE";
-      pusch_groupAssignment                                   = 0;
-      pusch_sequenceHoppingEnabled                            = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b                           = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff                            = 2;
-      ue_TimersAndConstants_t300                              = 1000;
-      ue_TimersAndConstants_t301                              = 1000;
-      ue_TimersAndConstants_t310                              = 1000;
-      ue_TimersAndConstants_t311                              = 10000;
-      ue_TimersAndConstants_n310                              = 20;
-      ue_TimersAndConstants_n311                              = 1;
-      ue_TransmissionMode                                    = 1;
-      },
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-        frame_type                                            = "FDD";
-        tdd_config                                            = 0;
-        tdd_config_s                                          = 0;
-        prefix_type                                           = "NORMAL";
-        eutra_band                                            = 1;
-        downlink_frequency                                    = 2150000000L;
-        uplink_frequency_offset                               = -200000000L;
-      Nid_cell                                        = 2;
-      N_RB_DL                                         = 50;
-      Nid_cell_mbsfn                                  = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx                                  = 1;
-      nb_antennas_rx                                  = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root                                      = 22;
-      prach_config_index                              = 3;
-      prach_high_speed                                = "DISABLE";
-      prach_zero_correlation                          = 5;
-      prach_freq_offset                               = 4;
-      pucch_delta_shift                               = 1;
-      pucch_nRB_CQI                                   = 0;
-      pucch_nCS_AN                                    = 0;
-      pucch_n1_AN                                     = 0;
-      pdsch_referenceSignalPower                              = -27;
-      pdsch_p_b                                               = 0;
-      pusch_n_SB                                              = 1;
-      pusch_enable64QAM                                       = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled                               = "ENABLE";
-      pusch_groupAssignment                                   = 0;
-      pusch_sequenceHoppingEnabled                            = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b                           = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff                            = 2;
-      ue_TimersAndConstants_t300                              = 1000;
-      ue_TimersAndConstants_t301                              = 1000;
-      ue_TimersAndConstants_t310                              = 1000;
-      ue_TimersAndConstants_t311                              = 10000;
-      ue_TimersAndConstants_n310                              = 20;
-      ue_TimersAndConstants_n311                              = 1;
-      ue_TransmissionMode                                    = 1;
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.4";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "l2sim-net";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDRESS";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-    };
-  }
-);
-
-# IP Address, port numbers and SSMode for System Simulator
-SSConfig = (
-   {
-        hostIp = "127.0.0.1"; #Host IP for System Simulator
-        Sys_port = 7777; #Port Number for System Simulator Sys Port
-        Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-        Srb_port = 7778; #Port Number for System Simulator Srb Port
-        Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-        Vng_port = 7779; #Port Number for System Simulator VNG Port
-        Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-        Vtp_port = 7780; #Port Number for System Simulator VTP Port
-        Vtp_host =  "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-        Drb_port = 7781; #Port Number for System Simulator DRB Port
-        Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-        SysInd_port = 7782; #Port Number for System Simulator SysIND Port
-        SysInd_host =  "/tmp/eNBSysInd.pipe"; #Host for System Simulator DRB Port
-        SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-	{
-	num_cc = 3;
-	local_s_if_name  = "lo";
-	remote_s_address = "127.0.0.1";
-	local_s_address  = "127.0.0.1";
-	local_s_portc    = 50001;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-        #scheduler_mode = "fairRR";
-        }
-);
-
-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_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-#log_config =
-#    {
-#      global_log_level                      ="debug";
-#      global_log_verbosity                  ="low";
-#      hw_log_level                          ="error";
-#      hw_log_verbosity                      ="low";
-#      phy_log_level                         ="debug";
-#      phy_log_verbosity                     ="low";
-#      mac_log_level                         ="analysis";
-#      mac_log_verbosity                     ="low";
-#      rlc_log_level                         ="warn";
-#      rlc_log_verbosity                     ="low";
-#      pdcp_log_level                        ="analysis";
-#      pdcp_log_verbosity                    ="low";
-#      rrc_log_level                         ="analysis";
-#      rrc_log_verbosity                     ="full";
-#   };
-
-log_config =
-    {
-      global_log_level                      ="info";
-      pkt_log_level                         ="info";
-      #global_log_verbosity                  ="low";
-      #hw_log_level                          ="error";
-      #hw_log_verbosity                      ="low";
-      #phy_log_level                         ="error";
-      #phy_log_verbosity                     ="low";
-      mac_log_level                         ="info";
-      #mac_log_verbosity                     ="low";
-      #rlc_log_level                         ="warn";
-      #rlc_log_verbosity                     ="low";
-      #pdcp_log_level                        ="analysis";
-      #pdcp_log_verbosity                    ="low";
-      rrc_log_level                         ="info";
-      #rrc_log_verbosity                     ="full";
-   };
-
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band7_1CC.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_rcc.band7_1CC.tm1.nfapi.conf
@@ -1,251 +0,0 @@
-Active_eNBs = ( "eNB-Eurecom-LTEBox");
-# Asn1_verbosity, choice in: none, debug, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    eNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_ENB";
-
-    eNB_name  =  "eNB-Eurecom-LTEBox";
-
-    // 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:
-
-    component_carriers = (
-      {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 7;
-      downlink_frequency      			      = 2685000000L;
-      uplink_frequency_offset 			      = -120000000;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
-      pbch_repetition                                 = "FALSE";
-      prach_root              			      = 0;
-      prach_config_index      			      = 0;
-      prach_high_speed        			      = "DISABLE";
-      prach_zero_correlation  			      = 1;
-      prach_freq_offset       			      = 2;
-      pucch_delta_shift       			      = 1;
-      pucch_nRB_CQI           			      = 0;
-      pucch_nCS_AN            			      = 0;
-      pucch_n1_AN             			      = 0;
-      pdsch_referenceSignalPower 			      = -27;
-      pdsch_p_b                  			      = 0;
-      pusch_n_SB                 			      = 1;
-      pusch_enable64QAM          			      = "DISABLE";
-      pusch_hoppingMode                                  = "interSubFrame";
-      pusch_hoppingOffset                                = 0;
-      pusch_groupHoppingEnabled  			      = "ENABLE";
-      pusch_groupAssignment      			      = 0;
-      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
-      pusch_nDMRS1                                       = 1;
-      phich_duration                                     = "NORMAL";
-      phich_resource                                     = "ONESIXTH";
-      srs_enable                                         = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
-      srs_SubframeConfig                                 =;
-      srs_ackNackST                                      =;
-      srs_MaxUpPts                                       =;*/
-
-      pusch_p0_Nominal                                   = -96;
-      pusch_alpha                                        = "AL1";
-      pucch_p0_Nominal                                   = -104;
-      msg3_delta_Preamble                                = 6;
-      pucch_deltaF_Format1                               = "deltaF2";
-      pucch_deltaF_Format1b                              = "deltaF3";
-      pucch_deltaF_Format2                               = "deltaF0";
-      pucch_deltaF_Format2a                              = "deltaF0";
-      pucch_deltaF_Format2b		    	      = "deltaF0";
-
-      rach_numberOfRA_Preambles                          = 64;
-      rach_preamblesGroupAConfig                         = "DISABLE";
-      /*
-      rach_sizeOfRA_PreamblesGroupA                      = ;
-      rach_messageSizeGroupA                             = ;
-      rach_messagePowerOffsetGroupB                      = ;
-      */
-      rach_powerRampingStep                              = 4;
-      rach_preambleInitialReceivedTargetPower            = -108;
-      rach_preambleTransMax                              = 10;
-      rach_raResponseWindowSize                          = 10;
-      rach_macContentionResolutionTimer                  = 48;
-      rach_maxHARQ_Msg3Tx                                = 4;
-
-      pcch_default_PagingCycle                           = 128;
-      pcch_nB                                            = "oneT";
-      bcch_modificationPeriodCoeff			      = 2;
-      ue_TimersAndConstants_t300			      = 1000;
-      ue_TimersAndConstants_t301			      = 1000;
-      ue_TimersAndConstants_t310			      = 1000;
-      ue_TimersAndConstants_t311			      = 10000;
-      ue_TimersAndConstants_n310			      = 20;
-      ue_TimersAndConstants_n311			      = 1;
-      ue_TransmissionMode                                    = 1;
-
-      //Parameters for SIB18
-      rxPool_sc_CP_Len                                       = "normal";
-      rxPool_sc_Period                                       = "sf40";
-      rxPool_data_CP_Len                                     = "normal";
-      rxPool_ResourceConfig_prb_Num                          = 20;
-      rxPool_ResourceConfig_prb_Start                        = 5;
-      rxPool_ResourceConfig_prb_End                          = 44;
-      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
-      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
-      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
-      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
-      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
-      rxPool_dataHoppingConfig_rbOffset                               = 0;
-      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
-*/
-      // Parameters for SIB19
-      discRxPool_cp_Len                                               = "normal"
-      discRxPool_discPeriod                                           = "rf32"
-      discRxPool_numRetx                                              = 1;
-      discRxPool_numRepetition                                        = 2;
-      discRxPool_ResourceConfig_prb_Num                               = 5;
-      discRxPool_ResourceConfig_prb_Start                             = 3;
-      discRxPool_ResourceConfig_prb_End                               = 21;
-      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
-      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
-      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
-
-      }
-    );
-
-
-    srb1_parameters :
-    {
-        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
-        timer_poll_retransmit    = 80;
-
-        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
-        timer_reordering         = 35;
-
-        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
-        timer_status_prohibit    = 0;
-
-        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
-        poll_pdu                 =  4;
-
-        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
-        poll_byte                =  99999;
-
-        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
-        max_retx_threshold       =  4;
-    }
-
-    # ------- 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.61.149";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    enable_measurement_reports = "no";
-
-    ///X2
-    enable_x2 = "yes";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-
-    NETWORK_INTERFACES :
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "enp2s0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "10.87.0.16";
-        ENB_INTERFACE_NAME_FOR_S1U               = "enp2s0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "10.87.0.16";
-        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "10.87.0.16";
-        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
-        
-    };
-  }
-);
-
-# IP Address, port numbers and SSMode for System Simulator
-SSConfig = (
-   {
-        hostIp = "127.0.0.1"; #Host IP for System Simulator
-        Sys_port = 7777; #Port Number for System Simulator Sys Port
-        Srb_port = 7778; #Port Number for System Simulator Srb Port
-        Vng_port = 7779; #Port Number for System Simulator VNG Port
-        SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-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;
-	remote_s_portc   = 50000;
-	local_s_portd    = 50011;
-	remote_s_portd   = 50010;
-	tr_s_preference = "nfapi";
-	tr_n_preference = "local_RRC";
-	scheduler_mode = "fairRR";
-        }  
-);
-
-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_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-log_config =
-    {
-      global_log_level                      ="debug";
-      hw_log_level                          ="debug";
-      phy_log_level                         ="debug";
-      mac_log_level                         ="debug";
-      rlc_log_level                         ="debug";
-      pdcp_log_level                        ="debug";
-      rrc_log_level                         ="debug";
-   };
--- a/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_ue.nfapi.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/SS_proxy_ue.nfapi.conf
@@ -1,37 +0,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";
-};
-
-
-L1s = (
-        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "lo";
-	remote_n_address = "127.0.0.1";
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50000;
-	remote_n_portc   = 50001;
-	local_n_portd    = 50010;
-	remote_n_portd   = 50011;
-        }  
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
-);
--- a/ci-scripts/conf_files/3GPP_System_Simulator/ss-gNB.N78.fr1.40MHz.N300.fibocom.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/ss-gNB.N78.fr1.40MHz.N300.fibocom.conf
@@ -1,307 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-  #nr_cellid = 0L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 6;                                                # (type integer     TTCN: p_Kssb)
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 11;                                             # (type ControlResourceSetZero      TTCN: p_Coreset0_Index)  #p_Coreset0_OffsetRB (expressed in PRB of 30 KHz) depends On p_Coreset0_Index
-    searchSpaceZero = 0;                                                     # Cr0_id -> cr0_offset: (0,0) (1,1) (2,2) (3,3) (4,4) (5,0), (6,1) (7,2) (8,3) (9,4) (10,12) (11,14) (12,16) (13,12) (14,14) (15,16)
-  });                                                                        # p_offsetCarrierCoreset0 = p_OffsetToPointA/2 - p_OffsetToCarrier - p_Coreset0_OffsetRB
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 620640;   # 3309.6 MHz         # (type:ARFCN_VAlueNR    TTCN: p_SSB_ARFCN)
-     # absoluteFrequencySSB                  = 620352;   #3305.28 MHZ
-      dl_frequencyBand                      = 78;                            # (type:FreqBandIndiactorNR   TTCN: p_FreqBandIndicatorNR) as band=78 then p_SSBSubcarrierSpacing=30kHz (38.104)
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  620058; #620040;              # (type:ARFCN_VAlueNR   TTCN: p_PointA)
-      # dl_absoluteFrequencyPointA            =  620058;                     # p_OffsetToPointA= (p_SSB_ARFCN-p_kssb-p_PointA)/12 - 10*p_SSBSubcarrierSpacing/15Khz - p_SubCarrierSpacing/15KHz*p_OffsetToCarrier = 28 (PRB of 15 kHz SCS)
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;                            # (type:SCS_SpecificCarrier.offsetToCarrier     TTCN: p_OffsetToCarrier)
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;                             # (Type:SubcarrierSpacing     TTCN: p_SubcarrierSpacing we should put "kHz30")
-      dl_carrierBandwidth                   = 106; #51;                     # (type:SCS_SpecificCarrier.carrierBandwidth       TTCN: p_CarrierBandwidth)   we should also put p_DL_ChannelBandwidth = 40
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 28875; #13750;     # it works also for 20 MHZ bandwidth (51 PRB of 30 KHz)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                   = 1;
-
-      # pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                = 11;               # (Type ControlResourceSetZero     TTCN: p_Coreset0_Index)
-      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; # 51;
-      pMax                                              = 20;
-
-      # initialUplinkBWP
-        # genericParameters
-        initialULBWPlocationAndBandwidth                = 28875; #13750;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                   = 1;
-
-        # rach-ConfigCommon
-          # rach-ConfigGeneric
-          prach_ConfigurationIndex                      = 160;               # this is the most important parameter for PRACH: I made it alligned with TTCN conf
-          # prach_msg1_FDM
-          # 0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                = 0;
-          prach_msg1_FrequencyStart                     = 0;
-          zeroCorrelationZoneConfig                     = 15;
-          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  = 4;
-          # oneHalf (0..15) 4,8,12,16,...60,64
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 0;   # You have the choice between only Preamble indexes 0, 1, 2, 3
-          # 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;                   # (Type SubcarrierSpacing     TTCN : p_SubcarrierSpacing)
-
-
-    # ssb_PositionsInBurs_BitmapPR
-      # 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR       = 2;                                       # its important to dinf this parameter : manadatory
-      ssb_PositionsInBurst_Bitmap   = 2;
-      # 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-    #GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    #GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-   SSMode = 2; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Harware setup/USRP
-   }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 100;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 28;
-  #dl_harq_round_max = 1;
-  #ul_harq_round_max = 1;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "mgmt_addr=192.168.20.2,addr=192.168.20.2,clock_source=internal,time_source=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";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="error";
-  pkt_log_level				="error";
-  # hw_log_level                          ="debug";
-  # phy_log_level                         ="debug";
-  mac_log_level                         ="info";
-nr_mac_log_level ="info"
-  # rlc_log_level                         ="info";
-  # pdcp_log_level                        ="info";
-  rrc_log_level                         ="debug";
-#nr_rrc_log_level ="debug";
-  # ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
--- a/ci-scripts/conf_files/3GPP_System_Simulator/ss-gNB.N78.fr1.40MHz.b210.fibocom.conf
+++ b/ci-scripts/conf_files/3GPP_System_Simulator/ss-gNB.N78.fr1.40MHz.b210.fibocom.conf
@@ -1,304 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-  #nr_cellid = 0L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 6;                                                # (type integer     TTCN: p_Kssb)
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 11;                                             # (type ControlResourceSetZero      TTCN: p_Coreset0_Index)  #p_Coreset0_OffsetRB (expressed in PRB of 30 KHz) depends On p_Coreset0_Index
-    searchSpaceZero = 0;                                                     # Cr0_id -> cr0_offset: (0,0) (1,1) (2,2) (3,3) (4,4) (5,0), (6,1) (7,2) (8,3) (9,4) (10,12) (11,14) (12,16) (13,12) (14,14) (15,16)
-  });                                                                        # p_offsetCarrierCoreset0 = p_OffsetToPointA/2 - p_OffsetToCarrier - p_Coreset0_OffsetRB
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 620640;   # 3309.6 MHz         # (type:ARFCN_VAlueNR    TTCN: p_SSB_ARFCN)
-     # absoluteFrequencySSB                  = 620352;   #3305.28 MHZ
-      dl_frequencyBand                      = 78;                            # (type:FreqBandIndiactorNR   TTCN: p_FreqBandIndicatorNR) as band=78 then p_SSBSubcarrierSpacing=30kHz (38.104)
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  620058; #620040;              # (type:ARFCN_VAlueNR   TTCN: p_PointA)
-      # dl_absoluteFrequencyPointA            =  620058;                     # p_OffsetToPointA= (p_SSB_ARFCN-p_kssb-p_PointA)/12 - 10*p_SSBSubcarrierSpacing/15Khz - p_SubCarrierSpacing/15KHz*p_OffsetToCarrier = 28 (PRB of 15 kHz SCS)
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;                            # (type:SCS_SpecificCarrier.offsetToCarrier     TTCN: p_OffsetToCarrier)
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;                             # (Type:SubcarrierSpacing     TTCN: p_SubcarrierSpacing we should put "kHz30")
-      dl_carrierBandwidth                   = 106; #51;                     # (type:SCS_SpecificCarrier.carrierBandwidth       TTCN: p_CarrierBandwidth)   we should also put p_DL_ChannelBandwidth = 40
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 28875; #13750;     # it works also for 20 MHZ bandwidth (51 PRB of 30 KHz)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                   = 1;
-
-      # pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                = 11;               # (Type ControlResourceSetZero     TTCN: p_Coreset0_Index)
-      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; # 51;
-      pMax                                              = 20;
-
-      # initialUplinkBWP
-        # genericParameters
-        initialULBWPlocationAndBandwidth                = 28875; #13750;
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                   = 1;
-
-        # rach-ConfigCommon
-          # rach-ConfigGeneric
-          prach_ConfigurationIndex                      = 160;               # this is the most important parameter for PRACH: I made it alligned with TTCN conf
-          # prach_msg1_FDM
-          # 0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                = 0;
-          prach_msg1_FrequencyStart                     = 0;
-          zeroCorrelationZoneConfig                     = 15;
-          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  = 4;
-          # oneHalf (0..15) 4,8,12,16,...60,64
-          ssb_perRACH_OccasionAndCB_PreamblesPerSSB     = 0;   # You have the choice between only Preamble indexes 0, 1, 2, 3
-          # 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;                   # (Type SubcarrierSpacing     TTCN : p_SubcarrierSpacing)
-
-
-    # ssb_PositionsInBurs_BitmapPR
-      # 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR       = 2;                                       # its important to dinf this parameter : manadatory
-      ssb_PositionsInBurst_Bitmap   = 2;
-      # 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
-    #GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    #GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    #GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-  }
-
-}
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Sys_host =  "/tmp/eNBSys.pipe"; #Host for System Simulator SYS Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Srb_host =  "/tmp/eNBSrb.pipe"; #Host for System Simulator SRB Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vng_host =  "/tmp/eNBVng.pipe"; #Host for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Vtp_host = "/tmp/eNBVT.pipe"; #Host for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   Drb_host =  "/tmp/eNBDrb.pipe"; #Host for System Simulator DRB Port
-   SSMode = 2; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Harware setup/USRP
-   }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 300;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 100;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 28;
-  #dl_harq_round_max = 1;
-  #ul_harq_round_max = 1;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  #sdr_addrs = "mgmt_addr=192.168.20.2,addr=192.168.20.2,clock_source=internal,time_source=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";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  # hw_log_level                          ="debug";
-  # phy_log_level                         ="debug";
-  # mac_log_level                         ="debug";
-  # rlc_log_level                         ="info";
-  # pdcp_log_level                        ="info";
-  # rrc_log_level                         ="info";
-  # ngap_log_level                        ="debug";
-  # f1ap_log_level                        ="info";
-};
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
         eNB_instances  = [0];
-         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.10.2";

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

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

    }
 );  
--- a/ci-scripts/conf_files/gNB.N78.fr1.40MHz.N310.conf
+++ b/ci-scripts/conf_files/gNB.N78.fr1.40MHz.N310.conf
@@ -1,279 +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 = 1; }); });
-
-  nr_cellid = 12345678L;
-
-  ////////// Physical parameters:
-
-  ssb_SubcarrierOffset  = 0;  
-  pdsch_AntennaPorts_XP = 1;
-  pusch_AntennaPorts    = 1;
-  do_CSIRS              = 0;
-  do_SRS                = 0;
-  #ul_prbblacklist       = "135,136,137,138"
-
-  pdcch_ConfigSIB1 = ({
-    controlResourceSetZero = 12;
-    searchSpaceZero = 10;
-  });
-
-  servingCellConfigCommon = (
-  {
-    # spCellConfigCommon
-
-    physCellId = 0;
-
-    # downlinkConfigCommon
-      # frequencyInfoDL
-     # this is 3300.60 MHz + 53*12*30e-3 MHz = 3954.72
-      absoluteFrequencySSB                  = 623424;#621312;
-      dl_frequencyBand                      = 78;
-      # this is 3900.60 MHz
-      dl_absoluteFrequencyPointA            =  622152; #620040;
-
-      # scs-SpecificCarrierList
-      dl_offstToCarrier                      = 0;
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                  = 1;
-      dl_carrierBandwidth                   = 106;
-
-      # initialDownlinkBWP
-        # genericParameters
-        initialDLBWPlocationAndBandwidth                = 28875;
-        # 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                     = 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.70.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
-
-  NETWORK_INTERFACES :
-  {
-    GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp6s0";
-    GNB_IPV4_ADDRESS_FOR_NG_AMF              = "10.87.0.21";
-    GNB_INTERFACE_NAME_FOR_NGU               = "enp6s0";
-    GNB_IPV4_ADDRESS_FOR_NGU                 = "10.87.0.21";
-    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          = 200;
-  pusch_FailureThres          = 100;
-  ulsch_max_frame_inactivity  = 10;
-  ul_max_mcs                  = 28;
-  #dl_harq_round_max = 1;
-  #ul_harq_round_max = 1;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 80;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "mgmt_addr=192.168.20.2,addr=192.168.20.2,clock_source=internal,time_source=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";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="info";
-};
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -19,17 +19,147 @@ gNBs =


    nr_cellid = 12345678L;
+    force_256qam_off = 1;

    tr_s_preference = "f1";

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

+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
    # ------- SCTP definitions
    SCTP :
    {
@@ -51,9 +181,9 @@ gNBs =
    {

        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
@@ -75,11 +205,15 @@ security = {
  drb_ciphering = "yes";
  drb_integrity = "no";
 };
-
-log_config : {
-  global_log_level = "info";
-  pdcp_log_level = "info";
-  rrc_log_level = "info";
-  f1ap_log_level = "info";
-  ngap_log_level = "info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
@@ -1,29 +1,36 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+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_ID = 0xe00;

-    cell_type =  "CELL_MACRO_GNB";
+#     cell_type =  "CELL_MACRO_GNB";

-    gNB_name  =  "gNB-Eurecom-5GNRBox";
+    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 }) });

-    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});

-    tr_s_preference     = "local_mac"
+    nr_cellid = 12345678L;
+    force_256qam_off = 1;

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

-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts = 2;
-    min_rxtxtime = 6;
+    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 = (
    {
@@ -34,43 +41,43 @@ gNBs =
 #  downlinkConfigCommon
    #frequencyInfoDL
      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 621312;
+      absoluteFrequencySSB                                             = 641280;
      dl_frequencyBand                                                 = 78;
      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
+      dl_absoluteFrequencyPointA                                       = 640008;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 273;
+        dl_carrierBandwidth                                            = 106;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
+        # 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;
+        initialDLBWPsubcarrierSpacing                                   = 1;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;

  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
+      ul_frequencyBand                                              = 78;
      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
+      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 273;
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
      pMax                                                          = 20;
     #initialUplinkBWP
      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
+        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
+        initialULBWPsubcarrierSpacing                               = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
          prach_ConfigurationIndex                                  = 98;
@@ -79,7 +86,7 @@ gNBs =
          prach_msg1_FDM                                            = 0;
          prach_msg1_FrequencyStart                                 = 0;
          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
+          preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
          preambleTransMax                                          = 6;
 #powerRampingStep
@@ -92,7 +99,7 @@ gNBs =
 #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;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -152,8 +159,6 @@ gNBs =
  }

  );
-
-
    # ------- SCTP definitions
    SCTP :
    {
@@ -163,57 +168,26 @@ gNBs =
    };


-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+    ////////// AMF parameters:
+        amf_ip_address      = ( { ipv4       = "172.21.16.137";
                              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";
+    NETWORK_INTERFACES :
+    {
+
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
 );

-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
@@ -230,13 +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";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
@@ -1,85 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-CU");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-CU";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-     log_config :
-     {
-       global_log_level                      ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-       f1ap_log_level                         ="info";
-       ngap_log_level                         ="info";
-    };
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -8,7 +8,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

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

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


    nr_cellid = 12345678L;
+    force_256qam_off = 1;

    tr_s_preference = "f1";

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

+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 11;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 28875;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
    # ------- SCTP definitions
    SCTP :
    {
@@ -52,9 +182,9 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "192.168.71.150";
+        ipv4_cucp = "192.168.72.140";
        port_cucp = 38462;
-        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
+        ipv4_cuup = "192.168.72.141";
        port_cuup = 38462;
      }
    )
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
@@ -1,89 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "eth0";
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "172.21.16.137";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    E1_INTERFACE =
-    (
-      {
-        type = "cp";
-        ipv4_cucp = "192.168.68.194";
-        port_cucp = 38462;
-        ipv4_cuup = "192.168.68.196";
-        port_cuup = 38462;
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -7,8 +7,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

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

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

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

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

-log_config : {
-  global_log_level = "info";
-  pdcp_log_level   = "info";
-  f1ap_log_level   = "info";
-  ngap_log_level   = "info";
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
 };
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="debug";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="info";
+       ngap_log_level                         ="debug";
+    };
+
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
@@ -1,62 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-sa = 1;
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_CU_UP_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-
-    tr_s_preference = "f1";
-
-    local_s_if_name = "lo";
-    local_s_address = "192.168.68.196";
-    remote_s_address = "192.168.68.195";
-    local_s_portc   = 501;
-    local_s_portd   = 2153;
-    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    E1_INTERFACE =
-    (
-      {
-        type = "up";
-        ipv4_cucp = "192.168.68.194";
-        ipv4_cuup = "192.168.68.196";
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-log_config: {
-  global_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
@@ -7,7 +7,6 @@ gNBs =
 {
    ////////// Identification parameters:
    gNB_ID = 0xe00;
-    gNB_DU_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

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

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;

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

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

 #     cell_type =  "CELL_MACRO_GNB";

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

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


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

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;

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

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

 #     cell_type =  "CELL_MACRO_GNB";

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

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;


    servingCellConfigCommon = (
@@ -178,6 +178,7 @@ MACRLCs = (
    remote_n_portd  = 2153;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
+    ulsch_max_frame_inactivity = 1;
  }
 );

@@ -186,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
 }
 );
@@ -217,6 +218,15 @@ THREAD_STRUCT = (
  }
 );

-log_config : {
-  global_log_level = "info";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       f1ap_log_level                         ="debug";
+       ngap_log_level                         ="debug";
+    };
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -1,262 +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";
-                              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.131";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eno";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-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    = 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";
-};
--- a/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
+++ b/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,58 +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_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        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
@@ -230,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";
+    };
+
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -63,7 +63,6 @@ gNBs =
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialULBWPsubcarrierSpacing                                           = 1;
-        initialDLBWPcontrolResourceSetZero                                      = 0;
      #rach-ConfigCommon
        #rach-ConfigGeneric
          prach_ConfigurationIndex                                  = 98;
@@ -200,6 +199,7 @@ MACRLCs = (
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
    pucch_TargetSNRx10  = 200;
+    ulsch_max_frame_inactivity = 0;
  }
 );

--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -202,6 +202,7 @@ MACRLCs = (
  num_cc                     = 1;
  tr_s_preference            = "local_L1";
  tr_n_preference            = "local_RRC";
+  ulsch_max_frame_inactivity = 0;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -32,7 +32,7 @@ gNBs =
      absoluteFrequencySSB                                             = 432990;
      dl_frequencyBand                                                 = 66;
      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 430002;
+      dl_absoluteFrequencyPointA                                       = 430000;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -53,7 +53,7 @@ gNBs =
  #uplinkConfigCommon
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
-      ul_absoluteFrequencyPointA                                    = 350002;
+      ul_absoluteFrequencyPointA                                    = 350000;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -230,7 +230,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
    serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -32,7 +32,7 @@ gNBs =
      absoluteFrequencySSB                                          = 430590;
      dl_frequencyBand                                              = 66;
      # this is 2150 MHz
-      dl_absoluteFrequencyPointA                                    = 430002;
+      dl_absoluteFrequencyPointA                                    = 430000;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -54,7 +54,7 @@ gNBs =
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
      # this is 1750 MHz
-      ul_absoluteFrequencyPointA                                    = 350002;
+      ul_absoluteFrequencyPointA                                    = 350000;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -187,6 +187,7 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 0;
 }
 );

@@ -239,7 +240,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

    gNB_name  =  "gNB-OAI";

@@ -197,6 +197,8 @@ MACRLCs = (
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 180;
  pucch_TargetSNRx10 = 200;
+  ulsch_max_frame_inactivity = 1;
+  ul_max_mcs = 16;
 }
 );

@@ -218,7 +220,7 @@ RUs = (
  att_rx         = 0;
  bands          = [78];
  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 65;
+  max_rxgain                    = 75;
  eNB_instances  = [0];
  ##beamforming 1x2 matrix: 1 layer x 2 antennas
  bf_weights = [0x00007fff, 0x0000];
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -188,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
 }
 );
@@ -231,7 +232,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -190,6 +190,7 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
    pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
  }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -184,6 +184,7 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 10;
  ul_max_mcs                  = 9;
 }
 );
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -203,6 +203,7 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
    pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 0;
  }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -204,6 +204,7 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
 #    pucch_TargetSNRx10 = 150;
+     ulsch_max_frame_inactivity = 0;
  }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -186,6 +186,7 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 1;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -10,7 +10,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_ID = 0xe00;
+    gNB_CU_ID = 0xe00;

    gNB_name  =  "gNB-Eurecom-n78_20";

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

    servingCellConfigCommon = (
    {
@@ -75,7 +75,7 @@ gNBs =
        initialULBWPsubcarrierSpacing                                           = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
+          prach_ConfigurationIndex                                  = 98;
 #prach_msg1_FDM
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
@@ -192,6 +192,8 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
+    ulsch_max_frame_inactivity = 10;
+    ul_max_mcs         = 28;
  }
 );

@@ -218,7 +220,7 @@ RUs = (
        tr_preference  = "udp_ecpri_if5"
        nb_tx          = 2
        nb_rx          = 2
-        att_tx         = 18
+        att_tx         = 16
        att_rx         = 0;
        num_tp_cores   = 4;
        rxfh_core_id   = 9;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -30,7 +30,7 @@ gNBs =
      absoluteFrequencySSB                                             = 620736;
      dl_frequencyBand                                                 = 78;
      # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 620052;
+      dl_absoluteFrequencyPointA                                       = 620020;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -184,6 +184,7 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 0;
 }
 );

--- a/ci-scripts/conf_files/lteue.usim-ci-magma.conf
+++ b/ci-scripts/conf_files/lteue.usim-ci-magma.conf
@@ -1,45 +0,0 @@
-# List of known PLMNS
-PLMN: {
-    PLMN0: {
-           FULLNAME="OpenAirInterface";
-           SHORTNAME="OAICN";
-           MNC="92";
-           MCC="208";
-    };
-};
-
-UE0:
-{
-    USER: {
-        IMEI="356113022094149";
-        MANUFACTURER="OAI";
-        MODEL="LTE SoftModem";
-        PIN="0000";
-    };
-
-    SIM: {
-        MSIN="1000000003";
-        USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
-        OPC="c42449363bbad02b66d16bc975d77cc1";
-        MSISDN="001011234561010";
-    };
-
-    # Home PLMN Selector with Access Technology
-    HPLMN= "20892";
-
-    # User controlled PLMN Selector with Access Technology
-    UCPLMN_LIST = ();
-
-    # Operator PLMN List
-    OPLMN_LIST = ("20892");
-
-    # Operator controlled PLMN Selector with Access Technology
-    OCPLMN_LIST = ();
-
-    # Forbidden plmns
-    FPLMN_LIST = ();
-
-    # Equivalent home plmns
-    EHPLMN_LIST = ();
-
-};
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -208,6 +208,7 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
+     ulsch_max_frame_inactivity = 1;
  }
 );

--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -199,6 +199,7 @@ MACRLCs = (
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
    pucch_TargetSNRx10  = 200;
+    ulsch_max_frame_inactivity = 0;
  }
 );

--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -230,7 +230,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
    serveraddr = "server";
-    serverport = 4043;
+    serverport = "4043";
    options = (); #("saviq"); or/and "chanmod"
    modelname = "AWGN";
    IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -186,6 +186,7 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
+  ulsch_max_frame_inactivity  = 0;
 }
 );

@@ -228,7 +229,7 @@ THREAD_STRUCT = (
 rfsimulator :
 {
  serveraddr = "server";
-  serverport = 4043;
+  serverport = "4043";
  options = (); #("saviq"); or/and "chanmod"
  modelname = "AWGN";
  IQfile = "/tmp/rfsimulator.iqs";
--- a/ci-scripts/conf_files/untested/proxy_gnb.band78_2SSC.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/proxy_gnb.band78_2SSC.sa.fr1.106PRB.usrpn310.conf
@@ -1,372 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-     pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      },
-      {
-        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                               = 12952; # 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                            = 12952;
-# 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;
-  },
-  {
- #spCellConfigCommon
-
-      physCellId                                                    = 1;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                             = 641281;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640009;
-      #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                               = 12952; # 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                            = 12952;
-# 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 :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp2s0"; //BOND0
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.253.70"; //IP-Address of BOND0
-        GNB_INTERFACE_NAME_FOR_NGU               = "enp2s0"; //BOND0
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.253.70"; //IP-Address of BOND0
-        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-# IP Address and port numbers for System Simulator
-SSConfig = (
-   {
-   hostIp = "127.0.0.1"; #Host IP for System Simulator
-   Sys_port = 7777; #Port Number for System Simulator Sys Port
-   Srb_port = 7778; #Port Number for System Simulator Srb Port
-   Vng_port = 7779; #Port Number for System Simulator VNG Port
-   Vtp_port = 7780; #Port Number for System Simulator VTP Port
-   Drb_port = 7781; #Port Number for System Simulator DRB Port
-   SSMode = 1; #SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
-   }
-);
-
-MACRLCs = (
-        {
-        num_cc = 2;
-        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
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-);
-
-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";
-       pkt_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";
-    };
-
--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
@@ -1,34 +0,0 @@
-#this is a configuration file
-#used to build real time processing statistics 
-#for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.100.2x2.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref : 
-  feprx : 150.0
-  feptx_prec : 0.0
-  feptx_ofdm : 65.0
-  feptx_total : 177.0
-  L1 Tx processing : 700.0
-  DLSCH encoding : 226.0
-  L1 Rx processing : 640.0
-  PUSCH inner-receiver : 400.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 15.0
-  UL Indication : 3.0
-  Slot Indication : 17.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.25
-  UL Indication : 1.00
-  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.1x1.60.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref :
  feprx : 46.0
  feptx_prec : 15.0
  feptx_ofdm : 35.0
  feptx_total : 57.0
-  L1 Tx processing : 260.0
-  DLSCH encoding : 160.0
-  L1 Rx processing : 420.0
-  PUSCH inner-receiver : 170.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 8.0
-  UL Indication : 3.0
-  Slot Indication : 8.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  L1 Tx processing : 210.0
+  DLSCH encoding : 137.0
+  L1 Rx processing : 345.0
+  PUSCH inner-receiver : 210.0
+  PUSCH decoding : 210.0
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 60.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.2x2.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 120.0
  feptx_prec : 30.0
@@ -15,20 +15,18 @@ Ref :
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 11.0
-  UL Indication : 3.0
-  Slot Indication : 14.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.25
+  PUSCH decoding : 180.0 
+  DL & UL scheduling timing : 37.0
+  UL Indication : 38.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.60.2x2.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 84.0
-  feptx_prec : 14.0
+  feptx_prec : 11.0
  feptx_ofdm : 35.0
  feptx_total : 100.0
  L1 Tx processing : 400.0
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 13.0
-  UL Indication : 3.0
-  Slot Indication : 15.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.35
-  UL Indication : 1.00
-  Slot Indication : 0.35
+  PUSCH decoding : 210.0
+  Schedule Response : 111.0
+  DL & UL scheduling timing : 20.0
+  UL Indication : 127.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.default.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 43.0
  feptx_prec : 13.0
  feptx_ofdm : 33.0
  feptx_total : 55.0
-  L1 Tx processing : 220.0
-  DLSCH encoding : 130.0
-  L1 Rx processing : 387.0
+  L1 Tx processing : 170.0
+  DLSCH encoding : 118.0
+  L1 Rx processing : 305.0
  PUSCH inner-receiver : 150.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 6.0
-  UL Indication : 3.0
-  Slot Indication : 7.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  PUSCH decoding : 210.0
+  Schedule Response : 30.0
+  DL & UL scheduling timing : 10.0
+  UL Indication : 40.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/doGitLabMerge.sh
+++ b/ci-scripts/doGitLabMerge.sh
@@ -135,6 +135,8 @@ then
    exit $STATUS
 fi

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

 STATUS=`git status | egrep -c "You have unmerged paths.|fix conflicts"`
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu20
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu20
@@ -1,35 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 20.04
-#
-#---------------------------------------------------------------------
-
-FROM ran-base:develop as ran-tests
-
-RUN rm -Rf /oai-ran
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests
--- a/ci-scripts/docker_log_split.py
+++ b/ci-scripts/docker_log_split.py
@@ -0,0 +1,92 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+
+#-----------------------------------------------------------
+# Import Libs
+#-----------------------------------------------------------
+import sys		# arg
+import re		# reg
+import os
+import subprocess
+
+
+class SplitReport():
+	def __init__(self):
+		self.logfilename = ''
+		self.destinationFolder = ''
+
+	def split(self):
+		self.destinationFolder = self.logfilename.replace(".log","")
+		if os.path.isfile(self.logfilename):
+			newImageLog = open(self.logfilename + '.new', 'w')
+			copyFlag = True
+			with open(self.logfilename, 'r') as imageLog:
+				for line in imageLog:
+					header = False
+					ret = re.search('====== Start of log for ([0-9\.A-Za-z\-\_]+) ======', line)
+					if ret is not None:
+						copyFlag = False
+						header = True
+						detailedLogFile = open(self.destinationFolder + '/' + ret.group(1), 'w')
+					if copyFlag:
+						newImageLog.write(line)
+					ret = re.search('====== End of log for ([0-9\.A-Za-z\-\_]+) ======', line)
+					if ret is not None:
+						copyFlag = True
+						detailedLogFile.close()
+					elif not copyFlag and not header:
+						detailedLogFile.write(line)
+			imageLog.close()
+			newImageLog.close()
+			os.rename(self.logfilename + '.new', self.logfilename)
+		else:
+			print('Cannot split unfound file')
+
+#--------------------------------------------------------------------------------------------------------
+#
+# Start of main
+#
+#--------------------------------------------------------------------------------------------------------
+
+argvs = sys.argv
+argc = len(argvs)
+
+SP = SplitReport()
+
+while len(argvs) > 1:
+	myArgv = argvs.pop(1)
+	if re.match('^\-\-logfilename=(.+)$', myArgv, re.IGNORECASE):
+		matchReg = re.match('^\-\-logfilename=(.+)$', myArgv, re.IGNORECASE)
+		SP.logfilename = matchReg.group(1)
+
+SP.split()
+
+sys.exit(0)
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -262,12 +262,10 @@ class EPCManagement():
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
 			if re.search('start-mini-as-ue', self.cfgDeploy):
 				dFile = 'docker-compose-mini-nrf-asue.yaml'
-			elif re.search('basic', self.cfgDeploy):\
-				dFile = 'docker-compose-basic-nrf.yaml'
 			else:
 				dFile = 'docker-compose-mini-nrf.yaml'
 			mySSH.command('docker-compose -f ' + dFile + ' ps -a', '\$', 60)
@@ -584,7 +582,7 @@ class EPCManagement():
 				mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)

 			logging.debug('Terminating OAI CN5G')
-			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)
@@ -645,7 +643,7 @@ class EPCManagement():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(self.IPAddress, self.UserName, self.Password)
 		mySSH.command('docker-compose --version', '\$', 5)
-		result = re.search('docker-compose version 1|Docker Compose version v2', mySSH.getBefore())
+		result = re.search('docker-compose version 1', mySSH.getBefore())
 		if result is None:
 			mySSH.close()
 			HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
@@ -661,7 +659,6 @@ class EPCManagement():
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 		mySSH.command('if [ -d ' + self.SourceCodePath + '/logs ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/logs ; fi', '\$', 5)
 		mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts ' + self.SourceCodePath + '/logs', '\$', 5)
-		mySSH.command('rm -f ' + self.SourceCodePath + '/*.log', '\$', 5)

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

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


 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
@@ -268,11 +267,10 @@ def GetParametersFromXML(action):
 	elif action == 'Iperf':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
+		CiTestObj.iperf_direction = test.findtext('direction')
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
 		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
 		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
-		CiTestObj.iperf_tcp_rate_target = test.findtext('iperf_tcp_rate_target') or None
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
@@ -376,6 +374,20 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]

+	elif action == 'IperfFromContainer':
+		string_field = test.findtext('server_container_name')
+		if (string_field is not None):
+			CONTAINERS.svrContName = string_field
+		string_field = test.findtext('server_options')
+		if (string_field is not None):
+			CONTAINERS.svrOptions = string_field
+		string_field = test.findtext('client_container_name')
+		if (string_field is not None):
+			CONTAINERS.cliContName = string_field
+		string_field = test.findtext('client_options')
+		if (string_field is not None):
+			CONTAINERS.cliOptions = string_field
+
 	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest' or action == 'Run_LDPCt1Test':
 		ldpc.runargs = test.findtext('physim_run_args')

@@ -733,157 +745,143 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
-				try:
-					if action == 'Build_eNB':
-						RAN.BuildeNB(HTML)
-					elif action == 'WaitEndBuild_eNB':
-						RAN.WaitBuildeNBisFinished(HTML)
-					elif action == 'Custom_Command':
-						RAN.CustomCommand(HTML)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_eNB':
-						RAN.InitializeeNB(HTML, EPC)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_eNB':
-						RAN.TerminateeNB(HTML, EPC)
-					elif action == 'Initialize_UE':
-						CiTestObj.InitializeUE(HTML)
-					elif action == 'Terminate_UE':
-						CiTestObj.TerminateUE(HTML)
-					elif action == 'Attach_UE':
-						CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
-					elif action == 'Detach_UE':
-						CiTestObj.DetachUE(HTML)
-					elif action == 'DataDisable_UE':
-						CiTestObj.DataDisableUE(HTML)
-					elif action == 'DataEnable_UE':
-						CiTestObj.DataEnableUE(HTML)
-					elif action == 'CheckStatusUE':
-						CiTestObj.CheckStatusUE(HTML)
-					elif action == 'Build_OAI_UE':
-						CiTestObj.BuildOAIUE(HTML)
-					elif action == 'Initialize_OAI_UE':
-						CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_OAI_UE':
-						CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Ping':
-						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Iperf':
-						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_HSS':
-						EPC.InitializeHSS(HTML)
-					elif action == 'Terminate_HSS':
-						EPC.TerminateHSS(HTML)
-					elif action == 'Initialize_MME':
-						EPC.InitializeMME(HTML)
-					elif action == 'Terminate_MME':
-						EPC.TerminateMME(HTML)
-					elif action == 'Initialize_SPGW':
-						EPC.InitializeSPGW(HTML)
-					elif action == 'Terminate_SPGW':
-						EPC.TerminateSPGW(HTML)
-					elif action == 'Initialize_5GCN':
-						EPC.Initialize5GCN(HTML)
-					elif action == 'Terminate_5GCN':
-						EPC.Terminate5GCN(HTML)
-					elif action == 'Deploy_EPC':
-						EPC.DeployEpc(HTML)
-					elif action == 'Undeploy_EPC':
-						EPC.UndeployEpc(HTML)
-					elif action == 'IdleSleep':
-						CiTestObj.IdleSleep(HTML)
-					elif action == 'Perform_X2_Handover':
-						CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
-					elif action == 'Build_PhySim':
-						HTML=ldpc.Build_PhySim(HTML,CONST)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCTest':
-						HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCt1Test':
-						HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_NRulsimTest':
-						HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Pull_Cluster_Image':
-						if not CLUSTER.PullClusterImage(HTML,RAN):
-							RAN.prematureExit = True
-					elif action == 'Build_Cluster_Image':
-						if not CLUSTER.BuildClusterImage(HTML):
-							RAN.prematureExit = True
-					elif action == 'Build_Image':
-						success = CONTAINERS.BuildImage(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Run_Tests':
-						success = CONTAINERS.BuildRunTests(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Proxy':
-						success = CONTAINERS.BuildProxy(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Push_Local_Registry':
-						success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Pull_Local_Registry':
-						success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Clean_Test_Server_Images':
-						success = CONTAINERS.Clean_Test_Server_Images(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Object':
-						CONTAINERS.DeployObject(HTML, EPC)
-						if CONTAINERS.exitStatus==1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Undeploy_Object':
-						CONTAINERS.UndeployObject(HTML, RAN)
-						if CONTAINERS.exitStatus == 1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Cppcheck_Analysis':
-						SCA.CppCheckAnalysis(HTML)
-					elif action == 'LicenceAndFormattingCheck':
-						ret = SCA.LicenceAndFormattingCheck(HTML)
-						if ret != 0:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Run_PhySim':
-						PHYSIM.Deploy_PhySim(HTML, RAN)
-					elif action == 'DeployGenObject':
-						CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'UndeployGenObject':
-						CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'IperfFromContainer':
-						CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'StatsFromGenObject':
-						CONTAINERS.StatsFromGenObject(HTML)
-					elif action == 'Push_Images_To_Test_Servers':
-						logging.debug('To be implemented')
-					else:
-						sys.exit('Invalid class (action) from xml')
-				except Exception as e:
-					s = traceback.format_exc()
-					logging.error(f'while running CI, an exception occurred:\n{s}')
-					HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
-					RAN.prematureExit = True
-
+				if action == 'Build_eNB':
+					RAN.BuildeNB(HTML)
+				elif action == 'WaitEndBuild_eNB':
+					RAN.WaitBuildeNBisFinished(HTML)
+				elif action == 'Custom_Command':
+					logging.info(f"Executing custom command")
+					RAN.CustomCommand(HTML)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_eNB':
+					RAN.InitializeeNB(HTML, EPC)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_eNB':
+					RAN.TerminateeNB(HTML, EPC)
+				elif action == 'Initialize_UE':
+					CiTestObj.InitializeUE(HTML)
+				elif action == 'Terminate_UE':
+					CiTestObj.TerminateUE(HTML)
+				elif action == 'Attach_UE':
+					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
+				elif action == 'Detach_UE':
+					CiTestObj.DetachUE(HTML)
+				elif action == 'DataDisable_UE':
+					CiTestObj.DataDisableUE(HTML)
+				elif action == 'DataEnable_UE':
+					CiTestObj.DataEnableUE(HTML)
+				elif action == 'CheckStatusUE':
+					CiTestObj.CheckStatusUE(HTML)
+				elif action == 'Build_OAI_UE':
+					CiTestObj.BuildOAIUE(HTML)
+				elif action == 'Initialize_OAI_UE':
+					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_OAI_UE':
+					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Ping':
+					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Iperf':
+					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_HSS':
+					EPC.InitializeHSS(HTML)
+				elif action == 'Terminate_HSS':
+					EPC.TerminateHSS(HTML)
+				elif action == 'Initialize_MME':
+					EPC.InitializeMME(HTML)
+				elif action == 'Terminate_MME':
+					EPC.TerminateMME(HTML)
+				elif action == 'Initialize_SPGW':
+					EPC.InitializeSPGW(HTML)
+				elif action == 'Terminate_SPGW':
+					EPC.TerminateSPGW(HTML)
+				elif action == 'Initialize_5GCN':
+					EPC.Initialize5GCN(HTML)
+				elif action == 'Terminate_5GCN':
+					EPC.Terminate5GCN(HTML)
+				elif action == 'Deploy_EPC':
+					EPC.DeployEpc(HTML)
+				elif action == 'Undeploy_EPC':
+					EPC.UndeployEpc(HTML)
+				elif action == 'IdleSleep':
+					CiTestObj.IdleSleep(HTML)
+				elif action == 'Perform_X2_Handover':
+					CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
+				elif action == 'Build_PhySim':
+					HTML=ldpc.Build_PhySim(HTML,CONST)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCt1Test':
+					HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_NRulsimTest':
+					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Pull_Cluster_Image':
+					if not CLUSTER.PullClusterImage(HTML,RAN):
+						RAN.prematureExit = True
+				elif action == 'Build_Cluster_Image':
+					if not CLUSTER.BuildClusterImage(HTML):
+						RAN.prematureExit = True
+				elif action == 'Build_Image':
+					CONTAINERS.BuildImage(HTML)
+				elif action == 'Build_Proxy':
+					CONTAINERS.BuildProxy(HTML)
+				elif action == 'Push_Local_Registry':
+					success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Pull_Local_Registry':
+					success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Clean_Test_Server_Images':
+					success = CONTAINERS.Clean_Test_Server_Images(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Object':
+					CONTAINERS.DeployObject(HTML, EPC)
+					if CONTAINERS.exitStatus==1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Undeploy_Object':
+					CONTAINERS.UndeployObject(HTML, RAN)
+					if CONTAINERS.exitStatus == 1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Cppcheck_Analysis':
+					SCA.CppCheckAnalysis(HTML)
+				elif action == 'LicenceAndFormattingCheck':
+					ret = SCA.LicenceAndFormattingCheck(HTML)
+					if ret != 0:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Run_PhySim':
+					PHYSIM.Deploy_PhySim(HTML, RAN)
+				elif action == 'DeployGenObject':
+					CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'UndeployGenObject':
+					CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'IperfFromContainer':
+					CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'StatsFromGenObject':
+					CONTAINERS.StatsFromGenObject(HTML)
+				elif action == 'Push_Images_To_Test_Servers':
+					logging.debug('To be implemented')
+				else:
+					sys.exit('Invalid class (action) from xml')
 				if RAN.prematureExit:
 					if CiTestObj.testCase_id == CiTestObj.testMinStableId:
 						logging.warning('Scenario has reached minimal stability point')
--- a/ci-scripts/mbim_scripts/mbim-set-ip.sh
+++ b/ci-scripts/mbim_scripts/mbim-set-ip.sh
@@ -1,221 +0,0 @@
-#!/bin/bash
-
-# Modified by Karim Boutiba (karim.boutiba@eurecom.fr)
-# mbim-set-ip script version 1.1
-# Modified mbimcli IPv4 IPv6 parsing script based on parts of project https://github.com/grandcentrix/thinkpad-x260-modem-scripts
-# Licensed under the Apache License, Version 2.0
-# Modified by Jörgen Storvist, Techship http://www.techship.com
-# Further details in the Techship FAQ sections on using MBIM and setting correct modes in cellular modules:
-# https://techship.com/faq/how-to-set-up-a-simple-data-connection-over-the-mbim-interface-using-libmbim-and-driver-cdc-mbim-in-linux/
-#
-# Installation & Usage: 
-#
-# Verify that the cellular module is exposing the MBIM interface over the USB interface. 
-# Use mbimcli to check status for the cellular connection and enter the PIN code if necessary. 
-# Configure mbim-network.conf and place in /etc/ (example file included in the archive, check link bellow for details).
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# Start the mbim data connection with command:
-# mbim-network <MBIM-INTERFACE> start
-# Ensure execution of mbim-set-ip script with sufficient system priviledges
-# ./mbim-set-ip <MBIM-INTERFACE> <NETWORK-INTERFACE>
-#
-# Examples:
-# mbimcli -d /dev/cdc-wdm0 -p --query-device-caps
-# mbimcli -d /dev/cdc-wdm0 -p --enter-pin=1234
-# mbim-network /dev/cdc-wdm0 start
-# ./mbim-set-ip /dev/cdc-wdm0 wwan0
-#
-# You should now be able to ping over the data connection.
-# IP v4 ping: (only if IPv4 address was acquired from cellular module)
-# ping -4 -I wwan0 8.8.8.8
-# ping -4 -I wwan0 google.com
-
-# IP v6 ping: (only if IPv6 address was acquired from cellular module)
-# ping -6 -I wwan0 2001:4860:4860::8888
-# ping -6 -I wwan0 google.com
-#
-# The script relies on the linux tools mbimcli, ip, systemd-resolve
-# (Tested on libmbim 1.16.0 running on Ubuntu 18.10 cosmic (development) with kernel version 4.15.0)
-
-# Details on mbim-network and mbimcli
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# https://www.freedesktop.org/software/libmbim/man/latest/mbimcli.1.html
-
-ipv4_addresses=()
-ipv4_gateway=""
-ipv4_dns=()
-ipv4_mtu=""
-ipv6_addresses=()
-ipv6_gateway=""
-ipv6_dns=()
-ipv6_mtu=""
-
-#CONTROL-IFACE
-CONTROLDEV="$1" 
-#WWAN-IFACE
-DEV="$2" 
-SESSION="$3"
-echo $SESSION
-echo "Requesting IPv4 and IPv6 information through mbimcli proxy:"
-mbimcli -d $CONTROLDEV -p --query-ip-configuration
-IPDATA=$(mbimcli -d $CONTROLDEV -p --query-ip-configuration=$SESSION)
-
-function parse_ip {
-	#      IP [0]: '10.134.203.177/30'
-	local line_re="IP \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local ip_cnt=${BASH_REMATCH[1]}
-		local ip=${BASH_REMATCH[2]}
-	fi
-	echo "$ip"
-}
-
-function parse_gateway {
-	#    Gateway: '10.134.203.178'
-	local line_re="Gateway: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local gw=${BASH_REMATCH[1]}
-	fi
-	echo "$gw"
-}
-
-function parse_dns {
-	#      DNS [0]: '10.134.203.177/30'
-	local line_re="DNS \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local dns_cnt=${BASH_REMATCH[1]}
-		local dns=${BASH_REMATCH[2]}
-	fi
-	echo "$dns"
-}
-
-function parse_mtu {
-	#        MTU: '1500'
-	local line_re="MTU: '([0-9]+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local mtu=${BASH_REMATCH[1]}
-	fi
-	echo "$mtu"
-}
-while read -r line || [[ -n "$line" ]] ; do
-	[ -z "$line" ] && continue
-	case "$line" in
-		*"IPv4 configuration available: 'none'"*)
-		       	state="start"
-		        continue
-			;;
-		*"IPv4 configuration available"*)
-			state="ipv4"
-			continue
-			;;
-		*"IPv6 configuration available: 'none'"*)
-		        state="start"
-		        continue
-			;;
-		*"IPv6 configuration available"*)
-			state="ipv6"
-			continue
-			;;
-		*)
-			;;
-	esac
-	case "$state" in
-		"ipv4")
-
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv4_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv4_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv4_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv4_mtu="$row"
-				continue
-				;;
-			*)
-				;;
-			esac
-			;;
-
-		"ipv6")
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv6_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv6_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv6_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv6_mtu="$row"
-				continue
-				;;
-			*)
-				continue
-				;;
-			esac
-		;;
-	*)
-		continue
-	;;
-	esac
-done <<< "$IPDATA"
-
-execfile=$(mktemp)
-
-printf "ip link set $DEV down\n" >> $execfile
-printf "ip addr flush dev $DEV \n" >> $execfile
-printf "ip -6 addr flush dev $DEV \n" >> $execfile
-printf "ip link set $DEV up\n" >> $execfile
-
-if [[ "${#ipv4_addresses[@]}" > 0 ]]; then
-	printf "ip addr add %s dev $DEV broadcast +\n" "${ipv4_addresses[@]}" >> $execfile
-	printf "ip route add 192.168.61.0/24 via $ipv4_gateway dev $DEV\n" >> $execfile
-
-	if [ -n "$ipv4_mtu" ]; then
-		printf "ip link set mtu $ipv4_mtu dev $DEV \n" >> $execfile
-	fi
-	if [[ "${#ipv4_dns[@]}" > 0 ]]; then
-		printf "resolvectl -4 --interface=$DEV --set-dns=%s\n" "${ipv4_dns[@]}" >>$execfile
-	fi
-fi
-
-if [[ "${#ipv6_addresses[@]}" > 0 ]]; then
-	printf "ip -6 addr add %s dev $DEV\n" "${ipv6_addresses[@]}" >> $execfile
-	printf "ip -6 route add default via $ipv6_gateway dev $DEV\n" >> $execfile
-	if [ -n "$ipv6_mtu" ]; then
-		printf "ip -6 link set mtu $ipv6_mtu dev $DEV\n" >> $execfile
-	fi
-	if [[ "${#ipv6_dns[@]}" > 0 ]]; then
-		printf "systemd-resolve -6 --interface=$DEV --set-dns=%s\n" "${ipv6_dns[@]}" >>$execfile
-	fi
-fi
-echo "Applying the following network interface configurations:"
-cat $execfile
-bash $execfile
-rm $execfile
-echo "Network interface configurations completed."
--- a/ci-scripts/mbim_scripts/start_quectel_mbim.sh
+++ b/ci-scripts/mbim_scripts/start_quectel_mbim.sh
@@ -1,10 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
-sleep 1
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=on
-sleep 2
-sudo mbimcli -p -d /dev/cdc-wdm0 --attach-packet-service
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --connect=session-id=0,access-string=oai.ipv4,ip-type=ipv4
-sudo /opt/mbim/mbim-set-ip.sh /dev/cdc-wdm0 wwan0 0
--- a/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
+++ b/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
@@ -1,3 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -260,7 +260,6 @@ class RANManagement():
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML)

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

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


 			#real time statistics
@@ -1179,10 +1178,8 @@ class RANManagement():
 				self.datalog_rt_stats=datalog_rt_stats
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
-					valnorm = float(datalog_rt_stats['Data'][k][3])
-					dev = datalog_rt_stats['DeviationThreshold'][k]
-					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
-						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
+					if float(datalog_rt_stats['Data'][k][3])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
+						logging.debug('\u001B[1;30;43m datalog_rt_stats metric ' + k + '=' + datalog_rt_stats['Data'][k][3] + ' > threshold ' + str(datalog_rt_stats['Threshold'][k]) + ' \u001B[0m')
 						RealTimeProcessingIssue = True
 			else:
 				statMsg = 'No real time stats found in the log file\n'
--- a/ci-scripts/stats_monitor_conf.yaml
+++ b/ci-scripts/stats_monitor_conf.yaml
@@ -24,9 +24,9 @@ gnb :
    DLSCH encoding:
    L1 Rx processing:
    PUSCH inner-receiver:
+    PUSCH decoding:
    DL & UL scheduling timing:
    UL Indication:
-    Slot Indication:
  graph : 
    page1:
      dlsch_err:
@@ -44,6 +44,6 @@ gnb :
      rt.L1 Rx processing:
    page4:
      rt.PUSCH inner-receiver:
+      rt.PUSCH decoding:
      rt.DL & UL scheduling timing:
      rt.UL Indication:
-      rt.Slot Indication:
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -34,13 +34,13 @@
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
-  - Build_Run_Tests
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
  - Deploy_Run_PhySim
  - DeployGenObject
  - UndeployGenObject
+  - IperfFromContainer
  - StatsFromGenObject
  - LicenceAndFormattingCheck
  - Push_Local_Registry
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+                <proxy_commit>a2fa216</proxy_commit>
        </testCase>

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

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

        <testCase id="020001">
@@ -105,23 +105,21 @@
        </testCase>

        <testCase id="030011">
-                <class>Iperf</class>
+                <class>IperfFromContainer</class>
                <desc>Iperf UDP Downlink</desc>
-                <id>l2sim4g_ue</id>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <server_container_name>l2sim4g-oai-lte-ue1</server_container_name>
+                <client_container_name>l2sim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

        <testCase id="030012">
-                <class>Iperf</class>
+                <class>IperfFromContainer</class>
                <desc>Iperf UDP Uplink</desc>
-                <id>l2sim4g_ue</id>
-                <svr_id>l2sim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 3M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <server_container_name>l2sim4g-trf-gen</server_container_name>
+                <client_container_name>l2sim4g-oai-lte-ue1</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 3M</client_options>
        </testCase>

        <testCase id="100001">
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -110,24 +110,22 @@
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

-        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        <testCase id="030011">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 2M</client_options>
        </testCase>

-        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_ext_dn</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        <testCase id="030012">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-trf-gen</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

        <testCase id="100011">
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -91,23 +91,21 @@
        </testCase>

        <testCase id="030011">
-                <class>Iperf</class>
-                <desc>Iperf UDP DL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim4g-oai-lte-ue0</server_container_name>
+                <client_container_name>rfsim4g-oai-enb</client_container_name>
+                <server_options>-B 10.0.1.2 -u -i 1 -s</server_options>
+                <client_options>-B 10.0.1.1 -c 10.0.1.2 -u -i 1 -t 30 -b 2M</client_options>
        </testCase>

        <testCase id="030012">
-                <class>Iperf</class>
-                <desc>Iperf UDP UL</desc>
-                <id>rfsim4g_ue</id>
-                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <iperf_args>-u -t 30 -b 1M</iperf_args>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim4g-oai-enb</server_container_name>
+                <client_container_name>rfsim4g-oai-lte-ue0</client_container_name>
+                <server_options>-B 10.0.1.1 -u -i 1 -s</server_options>
+                <client_options>-B 10.0.1.2 -c 10.0.1.1 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

        <testCase id="100011">
--- a/Show More
+++ b/Show More