fix(phy_procedures_nr_gNB): Increase the size of the thread info array in openair1/SCHED_NR/phy_procedures_nr_gNB.c

Merge branch 'integration_2024_w49' into 'develop'
Integration: `2024.w49` See merge request oai/openairinterface5g!3148 * !3065 NAS Service Request enc/dec implementation * !3129 Refactor UL MAC PDU decoding * !3136 Use ninja -k option in CI * !3137 T tracer: add macpdu traces for the NR UE * !2392 Documentation: add multi-UE deployment with RFsimulator * !3145 a lib has been added but missed dependancies * !3050 doc: Add instructions for 5G NR gNB frequency configuration * !3141 CI: Allow restart of the container if deployment fails * !3138 Align YAML config getlist with libconfig implementation * !3140 remove un-necessary global variables * !3146 Updates to match more fapi-compliant tx_data.request * !3025 New threadpool, fixed in NR UE * CI: Remove USRP mgmt_addr from LTE-2x2 conf files * !3147 Fronthaul xran library update to F release (2. and final step towards M-plane integration) * !3142 Add CI test to trigger RLF with high pathloss in channelmod
2026-07-15 05:30:29 +00:00 · 2024-12-11 10:32:06 +01:00 · 2024-12-10 13:33:23 +00:00 · 2024-12-10 09:15:00 +01:00 · 2024-12-09 09:59:09 +01:00 · 2024-12-08 21:07:05 +01:00
679 changed files with 27139 additions and 18384 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,61 @@
 # RELEASE NOTES: #

+## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
+
+General 5G improvements (both gNB and UE):
+- Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
+- Experimental support for FR2 operation
+- Support for GEO NTN and simulation of GEO satellite channel in RFsimulator
+  (see [`RUNMODEM.md`](doc/RUNMODEM.md))
+- Support 2-step RA
+- Add optional LTTng logger in logging module (see
+  [`lttng_logs.md`](common/utils/LOG/DOC/lttng_logs.md))
+- Support for YAML-based config files (alongside libconfig) (see
+  [`gnb.sa.band78.106prb.rfsim.yaml`](ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml) and
+  [`nrue.uicc.yaml`](ci-scripts/conf_files/nrue.uicc.yaml))
+- Add new L1 scope based on Dear ImGui (see [`readme.md`](openair1/PHY/TOOLS/readme.md))
+- Allow cross-compilation on ARM (via SIMDE SIMD emulation library)
+- Allow to build and run with clang
+- Support/check for Linux capabilities, allow to run without sudo (see
+  [`tuning_and_security.md`](doc/tuning_and_security.md))
+- OAI does not modify CPU frequency and networking stack
+  ([`tuning_and_security.md`](doc/tuning_and_security.md))
+- Bugfixes in the entire stack (e.g.  #547, #663, #674, #687, #712, #736, #739,
+  #741, #756, #762, #773, ...)
+
+5G gNB:
+- Support for FR2 interoperability with COTS UE (no beam switching supported yet)
+- Add 4-layer DL MIMO (experimental)
+- Add gNB Neighbour configuration and Mobility over F1 interface (see
+  [`handover-tutorial.md`](doc/handover-tutorial.md))
+- Enhance O-RAN FHI 7.2: (see [`ORAN_FHI7.2_Tutorial.md`](doc/ORAN_FHI7.2_Tutorial.md))
+  * Support different bandwidths (40/60/80/100MHz) and antenna configs (1x1 up
+    to 4x4) for Benetel/VVDN/LITEON RUs
+  * Add support for multi-RU support (single-cell/distributed antenna)
+- Support AMD T2 Telco card look-aside L1 accelerator (see
+  [`LDPC_T2_OFFLOAD_SETUP.md`](doc/LDPC_T2_OFFLOAD_SETUP.md))
+- Support Nvidia Aerial/ARC in-line L1 accelerator (see
+  [`Aerial_FAPI_Split_Tutorial.md`](doc/Aerial_FAPI_Split_Tutorial.md))
+- Various fixes for multi-UE operation: by default support of up to 16 UEs concurrently
+- Documentation for
+  - 5G MAC (see [`mac-usage.md`](doc/MAC/mac-usage.md))
+  - 5G RRC (see [`rrc-usage.md`](doc/RRC/rrc-usage.md))
+  - E1 (see [`E1-design.md`](doc/E1AP/E1-design.md))
+  - F1 (see [`F1-design.md`](doc/F1AP/F1-design.md))
+
+5G UE:
+- Basic interoperability with COTS gNB (Nokia gNB)
+- Implement PHR reporting
+- Implement RRC re-establishment
+- Implement PUCCH/PUSCH/SRS power control
+- Implement UCI on PUSCH and aperiodic CSI reporting
+- Support of cell search (within the selected UE bandwidth) (see [`RUNMODEM.md`](doc/RUNMODEM.md))
+- Enhance connection control: implement timers, resync
+- A lot of internal cleanup
+
+This release also includes many fixes and documentation updates. See
+`doc/README.md` in the repository for an overview of documentation.
+
 ## [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.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ include("cmake_targets/CPM.cmake")
 option(CCACHE_ACTIVE "CCache" ON)
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND AND CCACHE_ACTIVE)
-  if(${CMAKE_VERSION} VERSION_LESS "3.4.0") 
+  if(${CMAKE_VERSION} VERSION_LESS "3.4.0")
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
    message(STATUS "Found ccache in ${CCACHE_FOUND}. Using ccache. CMake < 3.4")
  else()
@@ -105,13 +105,13 @@ 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   
+# -so to avoid AVX512 instructions generation by gcc
 if(EXISTS "/proc/cpuinfo" AND NOT CROSS_COMPILE)
  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)

@@ -175,9 +175,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
 endif()

 set(CMAKE_C_FLAGS
-  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops")
+  "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS
-  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11")
+  "${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11 ${CMAKE_CXX_FLAGS}")


 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
@@ -271,6 +271,11 @@ add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)

+add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
+if (TRACY_ENABLE)
+  CPMAddPackage("gh:wolfpld/tracy#v0.11.1")
+endif()
+
 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)
@@ -636,7 +641,8 @@ if (cap_FOUND)
  target_link_libraries(UTIL PRIVATE cap)
  target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)
 endif()
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)
+target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils barrier actor)
+target_link_libraries(UTIL PUBLIC instrumentation)

 set(SECURITY_SRC
  ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -677,7 +683,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)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)

 set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -695,7 +701,7 @@ set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)

 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -706,7 +712,7 @@ set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
 )
 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)
+target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)

 # nFAPI
 #################################
@@ -717,7 +723,7 @@ set(NFAPI_SRC
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)
+target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)

 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -742,7 +748,7 @@ set(NFAPI_VNF_SRC
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
 target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)
 if(OAI_AERIAL)
  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
 endif()
@@ -758,7 +764,8 @@ set(NFAPI_USER_SRC
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
 include_directories(${NFAPI_USER_DIR})

 # Layer 1
@@ -772,7 +779,7 @@ set(PHY_TURBOSRC
  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c
 )
 set(PHY_POLARSRC
-  ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -1118,7 +1125,7 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp
 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)
+target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs PUBLIC UTIL)

 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1127,7 +1134,7 @@ 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)
+target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 # RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
 # be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
@@ -1135,6 +1142,7 @@ 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 PUBLIC UTIL)

 add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common)
@@ -1144,10 +1152,10 @@ target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)

 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)

 add_library(PHY_RU ${PHY_SRC_RU})
-target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
+target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)

 #Library for mex functions
 #########################3
@@ -1216,7 +1224,7 @@ 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
@@ -1374,7 +1382,6 @@ set (MAC_NR_SRC_UE
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
-  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
 )

 set (ENB_APP_SRC
@@ -1423,7 +1430,7 @@ endif()


 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)

 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1478,7 +1485,7 @@ target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)

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

 add_library(MAC_NR_COMMON
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1562,6 +1569,10 @@ set(libnas_emm_msg_OBJS
  ${NAS_SRC}COMMON/EMM/MSG/UplinkNasTransport.c
 )

+set(libnas_fgs_msg_OBJS
+  ${NAS_SRC}COMMON/EMM/MSG/fgs_service_request.c
+)
+
 set(libnas_esm_msg_OBJS
  ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
  ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
@@ -1675,7 +1686,6 @@ set (libnas_utils_OBJS
  ${NAS_SRC}COMMON/UTIL/nas_timer.c
  ${NAS_SRC}COMMON/UTIL/socket.c
  ${NAS_SRC}COMMON/UTIL/stty.c
-  ${NAS_SRC}COMMON/UTIL/TLVEncoder.c
  ${NAS_SRC}COMMON/UTIL/TLVDecoder.c
  ${NAS_SRC}COMMON/UTIL/OctetString.c
 )
@@ -1786,6 +1796,7 @@ add_library(LIB_NAS_SIMUE
  ${libnas_api_OBJS}
  ${libnas_ue_api_OBJS}
  ${libnas_emm_msg_OBJS}
+  ${libnas_fgs_msg_OBJS}
  ${libnas_esm_msg_OBJS}
  ${libnas_ies_OBJS}
  ${libnas_utils_OBJS}
@@ -1832,6 +1843,7 @@ include_directories(${NAS_SRC}UE)
 include_directories(${NAS_SRC}UE/API/USER)
 include_directories(${NAS_SRC}UE/API/USIM)
 include_directories(${NAS_SRC}UE/EMM)
+include_directories(${NAS_SRC}UE/EMM/MSG)
 include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)
@@ -1898,12 +1910,6 @@ add_executable(measurement_display
  ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)

-add_executable(test5Gnas
-  ${OPENAIR_DIR}/openair3/TEST/test5Gnas.c
-)
-target_link_libraries (test5Gnas LIB_5GNAS_GNB minimal_lib )
-
-
 # lte-softmodem is both eNB and UE implementation
 ###################################################

@@ -2065,7 +2071,7 @@ 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
 #######################################

--- a/README.md
+++ b/README.md
@@ -7,9 +7,8 @@
    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
-    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore40-Green" alt="Supported OS Fedora 40"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>
 </p>

 <p align="center">
--- a/charts/physims/charts/nr-pbchsim.scs/Chart.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/Chart.yaml
@@ -0,0 +1,36 @@
+apiVersion: v1
+name: oai-nr-pbchsim-scs
+description: A Helm subchart for nr-pbchsim network function ("Other SCS" tests)
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application.
+appVersion: v1
+
+keywords:
+  - Physical Simulator
+  - nr-pbchsim
+  - RAN
+  - 5G
+
+sources:
+  - https://gitlab.eurecom.fr/oai/openairinterface5g
+
+maintainers:
+  - name:  OPENAIRINTERFACE
+    email: contact@openairinterface.org
--- a/charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl
+++ b/charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl
@@ -0,0 +1,63 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "oai-nr-pbchsim-scs.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "oai-nr-pbchsim-scs.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "oai-nr-pbchsim-scs.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "oai-nr-pbchsim-scs.labels" -}}
+helm.sh/chart: {{ include "oai-nr-pbchsim-scs.chart" . }}
+{{ include "oai-nr-pbchsim-scs.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "oai-nr-pbchsim-scs.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oai-nr-pbchsim-scs.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "oai-nr-pbchsim-scs.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "oai-nr-pbchsim-scs.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
--- a/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml
@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Chart.Name }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: physim
+    spec:
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+    {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+      - name: physim
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        env:
+        - name: OPENAIR_DIR
+          value: /opt/oai-physim
+        command: ["/bin/sh", "-c"]
+        args:
+        - >
+          cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.otherSCS" -d bin/ &&
+          echo "FINISHED" && sleep infinity
+      dnsPolicy: ClusterFirst
+      restartPolicy: Never
+      schedulerName: default-scheduler
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
+      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
+      nodeSelector:
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
+      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.scs/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.scs/values.yaml
@@ -0,0 +1,48 @@
+# Default values for oai-nr-pbchsim-scs
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  # pullPolicy: IfNotPresent or Never or Always
+  pullPolicy: Always
+
+imagePullSecrets: []
+
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: "oai-nr-pbchsim-scs"
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
+
+securityContext:
+  privileged: false
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -27,6 +27,7 @@ global:
    nrpbschsim106rb: dedale
    nrpbchsim217rb: dedale
    nrpbchsim273rb: dedale
+    nrpbchsimscs: dedale
    nrpsbchsim: dedale
    nrprachsim: dedale
    nrpucchsim: dedale
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -285,6 +285,29 @@ pipeline {
            }
          }
        }
+        stage ("OAI-FLEXRIC-RAN-Integration-Test") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                flexricRAN5GStatus = finalizeSlaveJob('OAI-FLEXRIC-RAN-Integration-Test')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += flexricRAN5GStatus
+              }
+            }
+          }
+        }
        stage ("L2-Sim-Test-4G") {
          when { expression {do4Gtest} }
          steps {
@@ -493,29 +516,6 @@ pipeline {
            }
          }
        }
-        stage ("Interop-F1") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
-            }
-          }
-          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')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += f1InteropStatus
-              }
-            }
-          }
-        }
        stage ("Sanity-Check OAI-CN5G") {
          when { expression {do5Gtest} }
          steps {
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -58,6 +58,8 @@ def eNB_CommitID
 def eNB_AllowMergeRequestProcess = false
 def eNB_TargetBranch

+def flexricOption = ""
+
 pipeline {
    agent {
        label pythonExecutor
@@ -148,18 +150,24 @@ pipeline {
                        allParametersPresent = false
                    }

+                    if (params.Flexric_Tag != null) {
+                        echo "This pipeline is configured to run with a FlexRIC deployment."
+                        echo "Appending FlexRicTag option to the list of options"
+                        flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
+                        echo "Using new Flexric option: ${flexricOption}"
+                    }
+
                    if (allParametersPresent) {
                        echo "All parameters are present"
                        if (eNB_AllowMergeRequestProcess) {
                            sh "git fetch"
                            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
-                        } else {
+                        } else if (eNB_CommitID != 'develop') {
                            sh "git fetch"
                            sh "git checkout -f ${eNB_CommitID}"
                        }
                    } else {
-                        echo "Some parameters are missing"
-                        sh "./ci-scripts/fail.sh"
+                        error "Some parameters are missing"
                    }
                }
            }
@@ -190,13 +198,13 @@ pipeline {
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
                            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
                        ]) {
-                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${mainPythonAllXmlFiles}"
+                            sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} ${mainPythonAllXmlFiles}"
                            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
                            for (xmlFile in myXmlTestSuite) {
                            if (fileExists(xmlFile)) {
                                try {
                                  timeout (time: 60, unit: 'MINUTES') {
-                                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
+                                    sh "python3 main.py --mode=TesteNB --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} ${flexricOption} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --XMLTestFile=${xmlFile}"
                                  }
                                } catch (Exception e) {
                                    currentBuild.result = 'FAILURE'
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -41,7 +41,7 @@ import constants as CONST
 #-----------------------------------------------------------


-def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):
+def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER):


    py_param_file_present = False
@@ -78,7 +78,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            CiTestObj.ranRepository = matchReg.group(1)
            RAN.ranRepository=matchReg.group(1)
            HTML.ranRepository=matchReg.group(1)
-            ldpc.ranRepository=matchReg.group(1)
            CONTAINERS.ranRepository=matchReg.group(1)
            SCA.ranRepository=matchReg.group(1)
            PHYSIM.ranRepository=matchReg.group(1)
@@ -89,7 +88,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            else:
                matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
            doMerge = matchReg.group(1)
-            ldpc.ranAllowMerge=matchReg.group(1)
            if ((doMerge == 'true') or (doMerge == 'True')):
                CiTestObj.ranAllowMerge = True
                RAN.ranAllowMerge=True
@@ -106,7 +104,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            CiTestObj.ranBranch = matchReg.group(1)
            RAN.ranBranch=matchReg.group(1)
            HTML.ranBranch=matchReg.group(1)
-            ldpc.ranBranch=matchReg.group(1)
            CONTAINERS.ranBranch=matchReg.group(1)
            SCA.ranBranch=matchReg.group(1)
            PHYSIM.ranBranch=matchReg.group(1)
@@ -119,7 +116,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            CiTestObj.ranCommitID = matchReg.group(1)
            RAN.ranCommitID=matchReg.group(1)
            HTML.ranCommitID=matchReg.group(1)
-            ldpc.ranCommitID=matchReg.group(1)
            CONTAINERS.ranCommitID=matchReg.group(1)
            SCA.ranCommitID=matchReg.group(1)
            PHYSIM.ranCommitID=matchReg.group(1)
@@ -132,7 +128,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            CiTestObj.ranTargetBranch = matchReg.group(1)
            RAN.ranTargetBranch=matchReg.group(1)
            HTML.ranTargetBranch=matchReg.group(1)
-            ldpc.ranTargetBranch=matchReg.group(1)
            CONTAINERS.ranTargetBranch=matchReg.group(1)
            SCA.ranTargetBranch=matchReg.group(1)
            PHYSIM.ranTargetBranch=matchReg.group(1)
@@ -141,7 +136,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNBIPAddress=matchReg.group(1)
-                ldpc.eNBIpAddr=matchReg.group(1)
                CONTAINERS.eNBIPAddress=matchReg.group(1)
                SCA.eNBIPAddress=matchReg.group(1)
                PHYSIM.eNBIPAddress=matchReg.group(1)
@@ -158,7 +152,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNBUserName=matchReg.group(1)
-                ldpc.eNBUserName=matchReg.group(1)
                CONTAINERS.eNBUserName=matchReg.group(1)
                SCA.eNBUserName=matchReg.group(1)
                PHYSIM.eNBUserName=matchReg.group(1)
@@ -175,7 +168,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNBPassword=matchReg.group(1)
-                ldpc.eNBPassWord=matchReg.group(1)
                CONTAINERS.eNBPassword=matchReg.group(1)
                SCA.eNBPassword=matchReg.group(1)
                PHYSIM.eNBPassword=matchReg.group(1)
@@ -192,7 +184,6 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNBSourceCodePath=matchReg.group(1)
-                ldpc.eNBSourceCodePath=matchReg.group(1)
                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
                SCA.eNBSourceCodePath=matchReg.group(1)
                PHYSIM.eNBSourceCodePath=matchReg.group(1)
@@ -273,6 +264,9 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
        elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
            RAN.BuildId = matchReg.group(1)
+        elif re.match('^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-FlexRicTag=(.+)$', myArgv, re.IGNORECASE)
+            CONTAINERS.flexricTag = matchReg.group(1)
        else:
            HELP.GenericHelp(CONST.Version)
            sys.exit('Invalid Parameter: ' + myArgv)
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -28,8 +28,8 @@ up2-fhi72:

 up2-aerial:
  Host: up2
-  AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh
+  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
  NetworkScript: ip a show dev wwan0
  IF: wwan0
  MTU: 1500
@@ -75,6 +75,13 @@ oc-cn5g-20897:
  NetworkScript: echo "inet 172.21.6.105"
  RunIperf3Server: False

+oc-cn5g-20897-aerial2:
+  Host: aerial2
+  Namespace: "oaicicd-core-for-fhi72"
+  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  NetworkScript: echo "inet 172.21.6.105"
+  RunIperf3Server: False
+
 matix-cn5g:
  Host: matix
  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
@@ -382,20 +389,6 @@ rfsim4g_ue_fembms:
  CmdPrefix: docker exec rfsim4g-oai-lte-ue0
  IF: oaitun_uem1

-l2sim5g_ue:
-  Host: "%%current_host%%"
-  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: "%%current_host%%"
-  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
-  CmdPrefix: docker exec l2sim-oai-ext-dn
-
 l2sim4g_ue:
  Host: "%%current_host%%"
  AttachScript: docker start l2sim4g-oai-lte-ue1
--- a/ci-scripts/cls_analysis.py
+++ b/ci-scripts/cls_analysis.py
@@ -0,0 +1,82 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+
+import logging
+import re
+
+# Define the mapping of physim_test values to search patterns
+PHYSIM_PATTERN_MAPPING = {
+	'nr_ulsim': [
+		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
+		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
+	],
+	'nr_dlsim': [
+		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
+		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
+	],
+	'ldpctest': [
+		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
+		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
+	],
+}
+# Define test conditions based on the simulation type
+PHYSIM_TEST_CONDITION = {
+	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
+	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
+	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
+}
+
+class Analysis():
+
+	def analyze_physim(log, physim_test, options, threshold):
+		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
+		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
+		success = False
+		msg = ''
+
+		try:
+			with open(log, 'r') as f:
+				log_content = f.read()
+		except FileNotFoundError as e:
+			msg = f'{log} file not found, exception: {e}'
+			return False, msg
+		except Exception as e:
+			msg = f'Error while parsing log file {log}: exception: {e}'
+			return False, msg
+
+		if test_condition and test_condition not in log_content:
+			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
+			return False, msg
+
+		time1_match = re.search(search_patterns[0], log_content)
+		time2_match = re.search(search_patterns[1], log_content)
+		if not(time1_match and time2_match):
+			msg = f"Processing time not found in log file {log}."
+			return False, msg
+
+		success = float(time2_match.group(2)) < float(threshold)
+		if success:
+			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
+		else:
+			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
+
+		return success,msg
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -73,7 +73,7 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
-	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	ret = cmd.run(f'helm install --wait --timeout 120s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
 	if ret.returncode != 0:
 		logging.error('OC OAI CN5G: Deployment failed')
 		OC_logout(cmd)
@@ -126,8 +126,6 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
-		self.imageToPull = ''
-		self.testSvrId = None

 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -240,44 +238,30 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')

-	def PullClusterImage(self, HTML, RAN):
-		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
-		if self.imageToPull == '':
-			HELP.GenericHelp(CONST.Version)
-			raise ValueError('Insufficient Parameter')
-		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
+	def PullClusterImage(self, HTML, node, images):
+		logging.debug(f'Pull OC image {images} to server {node}')
 		self.testCase_id = HTML.testCase_id
-		cmd = cls_cmd.getConnection(self.testSvrId)
-		logging.info(cmd.run('docker --version'))
-		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
-		if not succeeded:
-			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
-		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
-		if ret.returncode != 0:
-			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
-			OC_logout(cmd)
-			cmd.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			return False
-		for image in self.imageToPull:
-			imagePrefix = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			imageTag = f"{image}:{tag}"
-			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
-				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
-				OC_logout(cmd)
-				cmd.close()
-				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+		with cls_cmd.getConnection(node) as cmd:
+			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
+			if not succeeded:
+				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 				return False
-			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
-			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
-		OC_logout(cmd)
-		cmd.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		return True
+			ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
+			if ret.returncode != 0:
+				logging.error(f'cannot authenticate at registry')
+				OC_logout(cmd)
+				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+				return False
+			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
+			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, registry, None, None)
+			OC_logout(cmd)
+		param = f"on node {node}"
+		if success:
+			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
+		else:
+			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
+		return success

 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -43,7 +43,6 @@ from zipfile import ZipFile
 # OAI Testing modules
 #-----------------------------------------------------------
 import cls_cmd
-import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
@@ -52,7 +51,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', 'oai-gnb-fhi72']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']

 def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -71,6 +70,8 @@ def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranc
 	return ret.returncode == 0

 def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
+	if ranCommitID == 'develop':
+		return 'develop'
 	shortCommit = ranCommitID[0:8]
 	if ranAllowMerge:
 		# Allowing contributor to have a name/branchName format
@@ -144,21 +145,6 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo

-def GetCredentials(instance):
-    server_id = instance.eNB_serverId[instance.eNB_instance]
-    if server_id == '0':
-        return (instance.eNBIPAddress, instance.eNBUserName, instance.eNBPassword, instance.eNBSourceCodePath)
-    elif server_id == '1':
-        return (instance.eNB1IPAddress, instance.eNB1UserName, instance.eNB1Password, instance.eNB1SourceCodePath)
-    elif server_id == '2':
-        return (instance.eNB2IPAddress, instance.eNB2UserName, instance.eNB2Password, instance.eNB2SourceCodePath)
-    else:
-        raise Exception ("Only supports maximum of 3 servers")
-
-def GetContainerName(ssh, svcName, file):
-	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".container_name'", silent=True)
-	return ret.stdout
-
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
 	if ret.returncode != 0:
@@ -166,31 +152,31 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()

-def GetContainerHealth(ssh, containerName):
-	if containerName is None:
-		return False
-	if 'db_init' in containerName or 'db-init' in containerName: # exits with 0, there cannot be healthy
-		return True
-	time.sleep(5)
-	for _ in range(3):
-		result = ssh.run(f'docker inspect --format="{{{{.State.Health.Status}}}}" {containerName}', silent=True)
+def GetServiceHealth(ssh, svcName, file):
+	if svcName is None:
+		return False, f"Service {svcName} not found in {file}"
+	image = GetImageName(ssh, svcName, file)
+	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
+		return True, f"Service {svcName} healthy, image {image}"
+	for _ in range(8):
+		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
 		if result.stdout == 'healthy':
-			return True
-		time.sleep(10)
-	return False
+			return True, f"Service {svcName} healthy, image {image}"
+		time.sleep(5)
+	return False, f"Failed to deploy: service {svcName}"

 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
-	ret = ssh.run(f'cat {wd}/.env', silent=True)
+	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
 	if ret.returncode != 0:
 		return False
 	env_vars = ret.stdout.strip().splitlines()
 	logging.info(f'{prompt} {wd}/.env: {env_vars}')
 	return True

-def WriteEnvFile(ssh, services, wd, tag):
-	ret = ssh.run(f'cat {wd}/.env', silent=True)
+def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
+	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
 	registry = "oai-ci" # pull_images() gives us this registry path
-	envs = {"REGISTRY":registry, "TAG": tag}
+	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
 		old_envs = {}
@@ -208,7 +194,9 @@ def WriteEnvFile(ssh, services, wd, tag):
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
-			if "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
+			if "oai-enb" in image: envs["ENB_IMG"] = "oai-enb-asan"
+			elif "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
+			elif "oai-lte-ue" in image: envs["LTEUE_IMG"] = "oai-lte-ue-asan"
 			elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan"
 			elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan"
 			else: logging.warning("undetected image format {image}, cannot use asan")
@@ -227,11 +215,10 @@ def GetServices(ssh, requested, file):
    else:
        return requested

-def CopyinContainerLog(ssh, lSourcePath, yaml, containerName, filename):
+def CopyinServiceLog(ssh, lSourcePath, yaml, svcName, wd_yaml, filename):
 	remote_filename = f"{lSourcePath}/cmake_targets/log/{filename}"
-	ssh.run(f'docker logs {containerName} &> {remote_filename}')
+	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
 	local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml}"
-	os.system(f'mkdir -p {local_dir}')
 	local_filename = f"{local_dir}/{filename}"
 	return ssh.copyin(remote_filename, local_filename)

@@ -344,38 +331,33 @@ class Containerize():
 		self.cliOptions = ''

 		self.imageToCopy = ''
-		self.registrySvrId = ''
-		self.testSvrId = ''
-		self.imageToPull = []
 		#checkers from xml
 		self.ran_checkers={}
+		self.num_attempts = 1
+
+		self.flexricTag = ''

 #-----------------------------------------------------------
 # Container management functions
 #-----------------------------------------------------------

+	def GetCredentials(self, server_id):
+		if server_id == '0':
+			ip, path = self.eNBIPAddress, self.eNBSourceCodePath
+		elif server_id == '1':
+			ip, path = self.eNB1IPAddress, self.eNB1SourceCodePath
+		elif server_id == '2':
+			ip, path = self.eNB2IPAddress, self.eNB2SourceCodePath
+		else:
+			raise ValueError(f"unknown server ID '{server_id}'")
+		if ip == '' or path == '':
+			HELP.GenericHelp(CONST.Version)
+			raise ValueError(f'Insufficient Parameter: IP/node {ip}, path {path}')
+		return (ip, path)
+
 	def BuildImage(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')
+		svr = self.eNB_serverId[self.eNB_instance]
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.RemoteCmd(lIpAddr)
 	
@@ -415,7 +397,9 @@ class Containerize():
 				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-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
@@ -571,50 +555,12 @@ class Containerize():
 			return False

 	def BuildProxy(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')
-		if self.proxyCommit is None:
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter (need proxyCommit for proxy build)')
+		svr = self.eNB_serverId[self.eNB_instance]
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
-		# Check that we are on Ubuntu
-		mySSH.command('hostnamectl', '\$', 5)
-		result = re.search('Ubuntu',  mySSH.getBefore())
-		self.host = result.group(0)
-		if self.host != 'Ubuntu':
-			logging.error('\u001B[1m Can build proxy only on Ubuntu server\u001B[0m')
-			mySSH.close()
-			sys.exit(1)
-
-		self.cli = 'docker'
-		self.cliBuildOptions = ''
-
-		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
+		ssh = cls_cmd.getConnection(lIpAddr)

+		self.testCase_id = HTML.testCase_id
 		oldRanCommidID = self.ranCommitID
 		oldRanRepository = self.ranRepository
 		oldRanAllowMerge = self.ranAllowMerge
@@ -623,30 +569,38 @@ class Containerize():
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
 		self.ranTargetBranch = 'master'
-		mySSH.command('cd ' +lSourcePath, '\$', 3)
-		# to prevent accidentally overwriting data that might be used later
-		self.ranCommitID = oldRanCommidID
-		self.ranRepository = oldRanRepository
-		self.ranAllowMerge = oldRanAllowMerge
-		self.ranTargetBranch = oldRanTargetBranch

 		# Let's remove any previous run artifacts if still there
-		mySSH.command(self.cli + ' image prune --force', '\$', 30)
+		ssh.run('docker image prune --force')
 		# Remove any previous proxy image
-		mySSH.command(self.cli + ' image rm oai-lte-multi-ue-proxy:latest || true', '\$', 30)
+		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')

 		tag = self.proxyCommit
 		logging.debug('building L2sim proxy image for tag ' + tag)
 		# check if the corresponding proxy image with tag exists. If not, build it
-		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
-		buildProxy = mySSH.getBefore().count('o such image') != 0
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		buildProxy = ret.returncode != 0 # if no image, build new proxy
 		if buildProxy:
-			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target oai-lte-multi-ue-proxy --tag proxy:' + tag + ' --file docker/Dockerfile.ubuntu18.04 . > cmake_targets/log/proxy-build.log 2>&1', '\$', 180)
-			mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
-			mySSH.command(self.cli + ' image prune --force || true','\$', 15)
-			if mySSH.getBefore().count('o such image') != 0:
+			ssh.run(f'rm -Rf {lSourcePath}')
+			success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+			if not success:
+				raise Exception("could not clone proxy repository")
+
+			filename = f'build_log_{self.testCase_id}'
+			fullpath = f'{lSourcePath}/{filename}'
+
+			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
+			ssh.run(f'zip -r -qq {fullpath}.zip {fullpath}')
+			local_file = f"{os.getcwd()}/../cmake_targets/log/{filename}.zip"
+			ssh.copyin(f'{fullpath}.zip', local_file)
+			# don't delete such that we might recover the zips
+			#ssh.run(f'rm -f {fullpath}.zip')
+
+			ssh.run('docker image prune --force')
+			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+			if ret.returncode != 0:
 				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-				mySSH.close()
+				ssh.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
 				return False
@@ -654,33 +608,20 @@ class Containerize():
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')

 		# retag the build images to that we pick it up later
-		mySSH.command('docker image tag proxy:' + tag + ' oai-lte-multi-ue-proxy:latest', '\$', 5)
-
-		# no merge: is a push to develop, tag the image so we can push it to the registry
-		if not self.ranAllowMerge:
-			mySSH.command('docker image tag proxy:' + tag + ' proxy:develop', '\$', 5)
+		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')

 		# we assume that the host on which this is built will also run the proxy. The proxy
 		# currently requires the following command, and the docker-compose up mechanism of
 		# the CI does not allow to run arbitrary commands. Note that the following actually
 		# belongs to the deployment, not the build of the proxy...
 		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
-		mySSH.command('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up', '\$', 5)
+		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')

-		# Analyzing the logs
-		if buildProxy:
-			self.testCase_id = HTML.testCase_id
-			mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-			mySSH.command('mkdir -p proxy_build_log_' + self.testCase_id, '\$', 5)
-			mySSH.command('mv log/* ' + 'proxy_build_log_' + self.testCase_id, '\$', 5)
-			if (os.path.isfile('./proxy_build_log_' + self.testCase_id + '.zip')):
-				os.remove('./proxy_build_log_' + self.testCase_id + '.zip')
-			if (os.path.isdir('./proxy_build_log_' + self.testCase_id)):
-				shutil.rmtree('./proxy_build_log_' + self.testCase_id)
-			mySSH.command('zip -r -qq proxy_build_log_' + self.testCase_id + '.zip proxy_build_log_' + self.testCase_id, '\$', 5)
-			mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
-			# don't delete such that we might recover the zips
-			#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
+		# to prevent accidentally overwriting data that might be used later
+		self.ranCommitID = oldRanCommidID
+		self.ranRepository = oldRanRepository
+		self.ranAllowMerge = oldRanAllowMerge
+		self.ranTargetBranch = oldRanTargetBranch

 		# we do not analyze the logs (we assume the proxy builds fine at this stage),
 		# but need to have the following information to correctly display the HTML
@@ -692,11 +633,11 @@ class Containerize():
 		files['Target Image Creation'] = errorandwarnings
 		collectInfo = {}
 		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())
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
 		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
+		ssh.run('docker volume prune --force')
+		ssh.close()

 		allImagesSize = {}
 		if result is not None:
@@ -716,27 +657,8 @@ class Containerize():
 			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')
+		svr = self.eNB_serverId[self.eNB_instance]
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.RemoteCmd(lIpAddr)
 		cmd.cd(lSourcePath)
@@ -783,7 +705,7 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])

 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
+		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
 		cmd.run(f'docker rmi ran-unittests:{baseTag}')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -798,34 +720,16 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False

-	def Push_Image_to_Local_Registry(self, HTML):
-		if self.registrySvrId == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.registrySvrId == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.registrySvrId == '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')
+	def Push_Image_to_Local_Registry(self, HTML, svr_id):
+		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
 		logging.debug('Pushing images from server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
+		ssh = cls_cmd.getConnection(lIpAddr)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
-		mySSH.command(f'docker login -u oaicicd -p oaicicd {imagePrefix}', '\$', 5)
-		if re.search('Login Succeeded', mySSH.getBefore()) is None:
+		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
+		if ret.returncode != 0:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
-			mySSH.close()
+			ssh.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False

@@ -835,148 +739,99 @@ class Containerize():
 		for image in IMAGES:
 			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
-			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}', '\$', 5)
-			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
+			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
 				continue
-			mySSH.command(f'docker push {imagePrefix}/{imageTag}', '\$', 120)
-			if re.search(': digest:', mySSH.getBefore()) is None:
-				logging.debug(mySSH.getBefore())
+			ret = ssh.run(f'docker push {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
 				msg = f'Could not push {image} to local registry : {imageTag}'
 				logging.error(msg)
-				mySSH.close()
+				ssh.close()
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			mySSH.command(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}', '\$', 30)
+			# Creating a develop tag on the local private registry
+			if not self.ranAllowMerge:
+				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:develop')
+				ssh.run(f'docker push {imagePrefix}/{image}:develop')
+				ssh.run(f'docker rmi {imagePrefix}/{image}:develop')
+			ssh.run(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}')

-		mySSH.command(f'docker logout {imagePrefix}', '\$', 5)
-		if re.search('Removing login credentials', mySSH.getBefore()) is None:
+		ret = ssh.run(f'docker logout {imagePrefix}')
+		if ret.returncode != 0:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
-			mySSH.close()
+			ssh.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False

-		mySSH.close()
+		ssh.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True

-	def Pull_Image_from_Local_Registry(self, HTML):
-		# This method can be called either onto a remote server (different from python executor)
-		# or directly on the python executor (ie lIpAddr == 'none')
-		if self.testSvrId == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.testSvrId == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.testSvrId == '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('\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}')
-		if response.returncode != 0:
-			msg = 'Could not log into local registry'
-			logging.error(msg)
-			myCmd.close()
-			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
-			return False
-		pulled_images = []
-		for image in self.imageToPull:
-			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			imageTag = f"{image}:{tagToUse}"
-			cmd = f'docker pull {imagePrefix}/{imageTag}'
-			response = myCmd.run(cmd, timeout=120)
+	def Pull_Image(cmd, images, tag, registry, username, password):
+		if username is not None and password is not None:
+			logging.info(f"logging into registry {username}@{registry}")
+			response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False)
 			if response.returncode != 0:
-				logging.debug(response)
-				msg = f'Could not pull {image} from local registry : {imageTag}'
+				msg = f'Could not log into registry {username}@{registry}'
 				logging.error(msg)
-				myCmd.close()
-				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
-				return False
-			myCmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
-			myCmd.run(f'docker rmi {imagePrefix}/{imageTag}')
-			pulled_images += [f"oai-ci/{imageTag}"]
-		response = myCmd.run(f'docker logout {imagePrefix}')
-		if response.returncode != 0:
-			msg = 'Could not log off from local registry'
-			logging.error(msg)
-			myCmd.close()
-			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
-			return False
-		myCmd.close()
-		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
-		HTML.CreateHtmlTestRowQueue('N/A', 'OK', [msg])
-		return True
-
-	def Clean_Test_Server_Images(self, HTML):
-		# This method can be called either onto a remote server (different from python executor)
-		# or directly on the python executor (ie lIpAddr == 'none')
-		if self.testSvrId == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.testSvrId == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.testSvrId == '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')
-		if lIpAddr != 'none':
-			logging.debug('Removing test images from server: ' + lIpAddr)
-			myCmd = cls_cmd.RemoteCmd(lIpAddr)
-		else:
-			logging.debug('Removing test images locally')
-			myCmd = cls_cmd.LocalCmd()
-
-		for image in IMAGES:
-			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+				return False, msg
+		pulled_images = []
+		for image in images:
 			imageTag = f"{image}:{tag}"
-			cmd = f'docker rmi oai-ci/{imageTag}'
-			myCmd.run(cmd, reportNonZero=False)
+			response = cmd.run(f'docker pull {registry}/{imageTag}')
+			if response.returncode != 0:
+				msg = f'Could not pull {image} from local registry: {imageTag}'
+				logging.error(msg)
+				return False, msg
+			cmd.run(f'docker tag {registry}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker rmi {registry}/{imageTag}')
+			pulled_images += [f"oai-ci/{imageTag}"]
+		if username is not None and password is not None:
+			response = cmd.run(f'docker logout {registry}')
+			# we have the images, if logout fails it's no problem
+		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
+		return True, msg

-		myCmd.close()
-		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-		return True
+	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
+		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
+		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
+		if not tag:
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+		with cls_cmd.getConnection(lIpAddr) as cmd:
+			success, msg = Containerize.Pull_Image(cmd, images, tag, registry, username, password)
+		param = f"on node {lIpAddr}"
+		if success:
+			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
+		else:
+			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
+		return success
+
+	def Clean_Test_Server_Images(self, HTML, svr_id, images, tag=None):
+		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
+		logging.debug(f'\u001B[1m Cleaning image(s) from server: {lIpAddr}\u001B[0m')
+		if not tag:
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+
+		status = True
+		with cls_cmd.getConnection(lIpAddr) as myCmd:
+			removed_images = []
+			for image in images:
+				fullImage = f"oai-ci/{image}:{tag}"
+				cmd = f'docker rmi {fullImage}'
+				if myCmd.run(cmd).returncode != 0:
+					status = False
+				removed_images += [fullImage]
+
+		msg = "Removed Images:\n" + '\n'.join(removed_images)
+		s = 'OK' if status else 'KO'
+		param = f"on node {lIpAddr}"
+		HTML.CreateHtmlTestRowQueue(param, s, [msg])
+		return status

 	def Create_Workspace(self,HTML):
-		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')
-		
+		svr = self.eNB_serverId[self.eNB_instance]
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
@@ -985,60 +840,60 @@ class Containerize():
 		return success

 	def DeployObject(self, HTML):
-		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
+		svr = self.eNB_serverId[self.eNB_instance]
+		num_attempts = self.num_attempts
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		logging.debug(f'Deploying OAI Object on server: {lIpAddr}')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
+		# creating the log folder by default
+		local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml.split('/')[-1]}"
+		os.system(f'mkdir -p {local_dir}')
 		wd = f'{lSourcePath}/{yaml}'
-
+		wd_yaml = f'{wd}/docker-compose.y*ml'
+		yaml_dir = yaml.split('/')[-1]
 		with cls_cmd.getConnection(lIpAddr) as ssh:
-			services = GetServices(ssh, self.services[self.eNB_instance], f"{wd}/docker-compose.y*ml")
+			services = GetServices(ssh, self.services[self.eNB_instance], wd_yaml)
 			if services == [] or services == ' ' or services == None:
-				msg = "Cannot determine services to start"
+				msg = 'Cannot determine services to start'
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
-
 			ExistEnvFilePrint(ssh, wd)
-			WriteEnvFile(ssh, services, wd, self.deploymentTag)
-
-			logging.info(f"will start services {services}")
-			status = ssh.run(f'docker compose -f {wd}/docker-compose.y*ml up -d -- {services}')
-			if status.returncode != 0:
-				msg = f"cannot deploy services {services}: {status.stdout}"
-				logging.error(msg)
-				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
-				return False
-
-			imagesInfo = []
-			fstatus = True
-			for svc in services.split():
-				containerName = GetContainerName(ssh, svc, f"{wd}/docker-compose.y*ml")
-				healthy = GetContainerHealth(ssh, containerName)
-				if not healthy:
-					tgtlogfile = f'{svc}-{HTML.testCase_id}.log'
-					logging.warning(f"Deployment Failed: Trying to copy container logs to {tgtlogfile}")
-					yaml_dir = yaml.split('/')[-1]
-					CopyinContainerLog(ssh, lSourcePath, yaml_dir, containerName, tgtlogfile)
-					imagesInfo += [f"Failed to deploy: service {svc}"]
-					fstatus = False
-				else:
-					image = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
-					logging.info(f"service {svc} healthy, container {containerName}, image {image}")
-					imagesInfo += [f"service {svc} healthy, image {image}"]
-		if fstatus:
+			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
+			if num_attempts <= 0:
+				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
+			for attempt in range(num_attempts):
+				imagesInfo = []
+				healthInfo = []
+				logging.info(f'will start services {services}')
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
+				if status.returncode != 0:
+					msg = f'cannot deploy services {services}: {status.stdout}'
+					logging.error(msg)
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
+					return False
+				for svc in services.split():
+					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
+					logging.info(msg)
+					imagesInfo.append(msg)
+					healthInfo.append(health)
+				deployed = all(healthInfo)
+				if deployed:
+					break
+				elif (attempt < num_attempts - 1):
+					logging.warning(f'Failed to deploy on attempt {attempt}, restart services {services}')
+					for svc in services.split():
+						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
+					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
+		if deployed:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
-		return fstatus
+		return deployed

 	def UndeployObject(self, HTML, RAN):
-		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
+		svr = self.eNB_serverId[self.eNB_instance]
+		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -1050,7 +905,7 @@ class Containerize():
 			if services is not None:
 				all_serv = " ".join([s for s, _ in services])
 				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
-				copyin_res = all(CopyinContainerLog(ssh, lSourcePath, yaml_dir, c, f'{s}-{HTML.testCase_id}.log') for s, c in services)
+				copyin_res = all(CopyinServiceLog(ssh, lSourcePath, yaml_dir, s, f"{wd}/docker-compose.y*ml", f'{s}-{HTML.testCase_id}.log') for s, c in services)
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
@@ -1066,121 +921,3 @@ class Containerize():
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		return success
-
-	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
-		logging.debug('Checking IP routing on ' + svrName)
-		mySSH = SSH.SSHConnection()
-		if svrName == 'porcepix':
-			mySSH.open(ipAddr, userName, password)
-			# Check if route to asterix gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
-			result = re.search('172.21.16.127', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
-			# Check if route to obelix enb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
-			result = re.search('172.21.16.128', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10)
-			# Check if forwarding is enabled
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
-		if svrName == 'asterix':
-			mySSH.open(ipAddr, userName, password)
-			# Check if route to porcepix epc exists
-			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
-			result = re.search('172.21.16.136', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev em1', '\$', 10)
-			# Check if route to porcepix cn5g exists
-			mySSH.command('ip route | grep --colour=never "192.168.70.128/26"', '\$', 10)
-			result = re.search('172.21.16.136', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.70.128/26 via 172.21.16.136 dev em1', '\$', 10)
-			# Check if X2 route to obelix enb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
-			result = re.search('172.21.16.128', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev em1', '\$', 10)
-			# Check if forwarding is enabled
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
-		if svrName == 'obelix':
-			mySSH.open(ipAddr, userName, password)
-			# Check if route to porcepix epc exists
-			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
-			result = re.search('172.21.16.136', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev eno1', '\$', 10)
-			# Check if X2 route to asterix gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
-			result = re.search('172.21.16.127', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
-			# Check if X2 route to nepes gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
-			result = re.search('172.21.16.137', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10)
-			# Check if forwarding is enabled
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
-		if svrName == 'nepes':
-			mySSH.open(ipAddr, userName, password)
-			# Check if route to ofqot gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
-			result = re.search('172.21.16.109', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10)
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
-		if svrName == 'ofqot':
-			mySSH.open(ipAddr, userName, password)
-			# Check if X2 route to nepes enb/epc exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
-			result = re.search('172.21.16.137', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10)
-			# Check if forwarding is enabled
-			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
-			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
-			# Check if iptables forwarding is accepted
-			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
-			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
-			mySSH.close()
--- a/ci-scripts/cls_native.py
+++ b/ci-scripts/cls_native.py
@@ -22,11 +22,15 @@

 import logging
 import re
+import os

 import cls_cmd
 import cls_oai_html
+import cls_analysis
 import constants as CONST

+LOG_PATH_PHYSIM = 'phy_sim_logs'
+
 class Native():

 	def Build(test_case, HTML, host, directory, options):
@@ -62,3 +66,19 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
+
+	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
+		logging.debug(f'Runnin {physim_test} on server: {host}')
+		workSpacePath = f'{directory}/cmake_targets'
+		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
+		runLogFile=f'physim_{HTML.testCase_id}.log'
+		with cls_cmd.getConnection(host) as cmd:
+			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
+			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
+		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
+		if success:
+			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
+		else:
+			logging.error(msg)
+			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
+		return success
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -147,7 +147,7 @@ class HTMLManagement():
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
 			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			if self.ranAllowMerge != '':
+			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
 				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
 				commit_message = commit_message.strip()
 				self.htmlFile.write('     <tr>\n')
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -43,7 +43,6 @@ import json
 #import our libs
 import helpreadme as HELP
 import constants as CONST
-import sshconnection

 import cls_module
 import cls_cmd
@@ -649,7 +648,7 @@ class OaiCiTest():
 				result = re.search('warning: discard PDU, sn out of window', str(line))
 				if result is not None:
 					nbPduDiscard += 1
-				result = re.search('--nfapi STANDALONE_PNF --node-number 2 --sa', str(line))
+				result = re.search('--nfapi STANDALONE_PNF --node-number 2', str(line))
 				if result is not None:
 					frequency_found = True
 			result = re.search('Exiting OAI softmodem', str(line))
@@ -895,55 +894,43 @@ class OaiCiTest():
 			SourceCodePath = self.UESourceCodePath
 		else:
 			sys.exit('Insufficient Parameter')
-		SSH = sshconnection.SSHConnection()
-		SSH.open(IPAddress, UserName, Password)
-		SSH.command(f'cd {SourceCodePath}', '\$', 5)
-		SSH.command('cd cmake_targets', '\$', 5)
-		SSH.command('rm -f build.log.zip', '\$', 5)
-		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
-		SSH.close()
+		with cls_cmd.getConnection(IPAddress) as cmd:
+			d = f'{SourceCodePath}/cmake_targets'
+			cmd.run(f'rm -f {d}/build.log.zip')
+			cmd.run(f'cd {d} && zip -r build.log.zip build_log_*/*')

 	def LogCollectPing(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if EPC.IPAddress == 'none':
 			sys.exit(0)
-		SSH = sshconnection.SSHConnection()
-		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
-		SSH.command('cd scripts', '\$', 5)
-		SSH.command('rm -f ping.log.zip', '\$', 5)
-		SSH.command('zip ping.log.zip ping*.log', '\$', 60)
-		SSH.command('rm ping*.log', '\$', 5)
-		SSH.close()
+		with cls_cmd.getConnection(EPC.IPAddress) as cmd:
+			d = f"{EPC.SourceCodePath}/scripts"
+			cmd.run(f'rm -f {d}/ping.log.zip')
+			cmd.run(f'cd {d} && zip ping.log.zip ping*.log')
+			cmd.run(f'rm {d}/ping*.log')

 	def LogCollectIperf(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if EPC.IPAddress == 'none':
 			sys.exit(0)
-		SSH = sshconnection.SSHConnection()
-		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
-		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
-		SSH.command('cd scripts', '\$', 5)
-		SSH.command('rm -f iperf.log.zip', '\$', 5)
-		SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
-		SSH.command('rm iperf*.log', '\$', 5)
-		SSH.close()
+		with cls_cmd.getConnection(EPC.IPAddress) as cmd:
+			d = f"{EPC.SourceCodePath}/scripts"
+			cmd.run(f'rm -f {d}/iperf.log.zip')
+			cmd.run(f'cd {d} && zip iperf.log.zip iperf*.log')
+			cmd.run(f'rm {d}/iperf*.log')
 	
 	def LogCollectOAIUE(self):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if self.UEIPAddress == 'none':
 			sys.exit(0)
-		SSH = sshconnection.SSHConnection()
-		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
-		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
-		SSH.command(f'cd cmake_targets', '\$', 5)
-		SSH.command(f'echo {self.UEPassword} | sudo -S rm -f ue.log.zip', '\$', 5)
-		SSH.command(f'echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
-		SSH.command(f'echo {self.UEPassword} | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
-		SSH.close()
+		with cls_cmd.getConnection(self.UEIPAddress) as cmd:
+			d = f'{self.UESourceCodePath}/cmake_targets'
+			cmd.run(f'echo {self.UEPassword} | sudo -S rm -f {d}/ue.log.zip')
+			cmd.run(f'cd {d} && echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt')
+			cmd.run(f'echo {self.UEPassword} | sudo -S rm {d}/ue*.log {d}/core* {d}/ue_*record.raw {d}/ue_*.pcap {d}/ue_*txt')

 	def ShowTestID(self):
 		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -1,262 +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
-# */
-#---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
-#
-#   Required Python Version
-#     Python 3.x
-#
-#   Required Python Package
-#     pexpect
-#---------------------------------------------------------------------
-
-#to use logging.info()
-import logging
-#to create a SSH object locally in the methods
-import sshconnection
-#to update the HTML object
-import cls_oai_html
-import cls_cmd
-#for log folder maintenance
-import os
-import re
-
-class PhySim:
-	def __init__(self):
-		self.buildargs = ""
-		self.runargs = ""
-		self.eNBIpAddr = ""
-		self.eNBUserName = ""
-		self.eNBPassWord = ""
-		self.eNBSourceCodePath = ""
-		self.ranRepository = ""
-		self.ranBranch = ""
-		self.ranCommitID= ""
-		self.ranAllowMerge= ""
-		self.ranTargetBranch= ""
-		self.forced_workspace_cleanup=False
-		#private attributes
-		self.__workSpacePath=''
-		self.__buildLogFile='compile_phy_sim.log'
-		self.__runLogFile=''
-		self.__runLogPath='phy_sim_logs'
-
-
-#-----------------
-#PRIVATE Methods
-#-----------------
-
-	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		#retrieve run log file and store it locally$
-		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
-		mySSH.close()
-		#parse results looking for Encoding and Decoding mean values
-		runResults=[]
-		with open(self.__runLogFile) as f:
-			for line in f:
-				if 'mean' in line:
-					runResults.append(line)
-		#the values are appended for each mean value (2), so we take these 2 values from the list
-		info = runResults[0] + runResults[1]
-
-		#once parsed move the local logfile to its folder for tidiness
-		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
-
-		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		return True
-
-	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
-		thrs_KO = int(self.timethrs)
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
-		#retrieve run log file and store it locally$
-		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
-		mySSH.close()
-		#parse results looking for encoder/decoder processing time values
-
-		with open(self.__runLogFile) as g:
-			for line in g:
-				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
-				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
-				if res_dec is not None:
-					time = res_dec.group(1)
-					info = res_dec.group(0)
-					break
-				if res_enc is not None:
-					time = res_enc.group(1)
-					info = res_enc.group(0)
-					break
-
-		# In case the T2 board does work properly, there is no statistics
-		if res_enc is None and res_dec is None:
-			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
-			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-			return False
-
-		#once parsed move the local logfile to its folder
-		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-		success = float(time) < thrs_KO
-		if success:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
-		else:
-			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
-			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
-		return success
-
-	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
-		#retrieve run log file and store it locally
-		mySSH = sshconnection.SSHConnection()
-		filename = self.__workSpacePath + self.__runLogFile
-		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
-		if ret != 0:
-			error_msg = f'could not recover test result file {filename}'
-			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
-			return False
-
-		PUSCH_OK = False
-		with open(self.__runLogFile) as f:
-			PUSCH_OK = 'PUSCH test OK' in f.read()
-
-		# once parsed move the local logfile to its folder for tidiness
-		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
-
-		#updating the HTML with results
-		if PUSCH_OK:
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
-		else:
-			error_msg = 'error: no "PUSCH test OK"'
-			logging.error(error_msg)
-			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
-		return PUSCH_OK
-
-	def __CheckBuild_PhySim(self, HTML, CONST):
-		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		#retrieve compile log file and store it locally
-		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__buildLogFile, '.')
-		#delete older run log file
-		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
-		mySSH.close()
-		#check build result from local compile log file
-		with open(self.__buildLogFile) as f:
-			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
-				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
-				return True
-		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
-		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
-		HTML.CreateHtmlTabFooter(False)
-		return False
-
-
-#-----------------$
-#PUBLIC Methods$
-#-----------------$
-
-	def Build_PhySim(self,htmlObj,constObj):
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-
-		#create working dir
-		mySSH.command('mkdir -p ' + self.eNBSourceCodePath, '\$', 5)
-		mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
-
-		if not self.ranRepository.lower().endswith('.git'):
-			self.ranRepository+='.git'
-
-		#git clone
-		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone '  + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
-		#git config
-		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
-		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
-
-		#git clean depending on self.forced_workspace_cleanup captured in xml
-		if self.forced_workspace_cleanup==True:
-			logging.info('Cleaning workspace ...')
-			mySSH.command('echo ' + self.eNBPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
-		else:
-			logging.info('Workspace cleaning was disabled')
-
-		# if the commit ID is provided, use it to point to it
-		if self.ranCommitID != '':
-			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
-		# if the branch is not develop, then it is a merge request and we need to do
-		# the potential merge. Note that merge conflicts should have already been checked earlier
-		if (self.ranAllowMerge):
-			if self.ranTargetBranch == '':
-				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
-			else:
-				logging.info('Merging with the target branch: ' + self.ranTargetBranch)
-				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
-
-		#build
-		mySSH.command('source oaienv', '\$', 5)
-		mySSH.command('cd cmake_targets', '\$', 5)
-		mySSH.command('mkdir -p log', '\$', 5)
-		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)
-
-		mySSH.close()
-		return __CheckBuild_PhySim(htmlObj,constObj)
-
-
-	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
-		#create run logs folder locally
-		os.system('mkdir -p ./'+self.__runLogPath)
-		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile='physim_'+str(testcase_id)+'.log'
-		#open a session for test run
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		mySSH.command('cd '+self.__workSpacePath,'\$',5)
-		#run and redirect the results to a log file
-		mySSH.command(self.__workSpacePath+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
-		mySSH.close()
-		return self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
-
-	def Run_T2Test(self,htmlObj,constObj,testcase_id):
-		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
-		#create run logs folder locally
-		os.system(f'mkdir -p ./{self.__runLogPath}')
-		#log file is tc_<testcase_id>.log remotely
-		self.__runLogFile=f'physim_{str(testcase_id)}.log'
-		#open a session for test run
-		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
-		mySSH.run(f'cd {self.__workSpacePath}')
-		#run and redirect the results to a log file
-		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
-		mySSH.close()
-		return self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
-
-	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
-		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
-		os.system(f'mkdir -p ./{self.__runLogPath}')
-		self.__runLogFile = f'physim_{testcase_id}.log'
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
-		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
-		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
-		mySSH.close()
-		return self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -163,7 +163,7 @@ class PhySim:
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 22:
+			if (running_count + completed_count) == 23:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())
--- a/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf
+++ b/ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf
@@ -228,7 +228,7 @@ RUs = (
        nb_tx          = 1
        nb_rx          = 1
        att_tx         = 0
-        att_rx         = 0;
+        att_rx         = 6;
        eNB_instances  = [0];
    }
 );
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -230,7 +230,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      = "addr=192.168.80.250";

    }
 );  
--- 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
@@ -230,7 +230,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      = "addr=192.168.80.250";

    }
 );  
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf
@@ -230,7 +230,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      = "addr=192.168.80.250";

    }
 );  
--- a/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
+++ b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf
@@ -191,7 +191,7 @@ RUs = (
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 6
-         att_rx         = 6;
+         att_rx         = 12;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 125;
--- a/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
+++ b/ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf
@@ -191,7 +191,7 @@ RUs = (
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 6
-         att_rx         = 6;
+         att_rx         = 12;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 125;
--- a/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.rfsim.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
+++ b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.rfsim.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
+++ b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf
@@ -224,7 +224,7 @@ RUs =
    nb_tx                         = 1
    nb_rx                         = 1
    att_tx                        = 3
-    att_rx                        = 0;
+    att_rx                        = 6;
    bands                         = [7];
    max_pdschReferenceSignalPower = -27;
    max_rxgain                    = 115;
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -1,7 +1,6 @@
 Active_gNBs = ( "cu-rfsim");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
@@ -1,7 +1,6 @@
 Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -1,8 +1,6 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
@@ -1,8 +1,6 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;
-sa = 1;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -1,7 +1,6 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-sa = 1;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
@@ -1,7 +1,6 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-sa = 1;

 gNBs =
 (
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -2,7 +2,6 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

-sa = 1;
 nfapi = "AERIAL";

 gNBs =
@@ -189,7 +188,7 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });


    NETWORK_INTERFACES :
--- a/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf
@@ -2,8 +2,6 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

-sa = 1;
-
 gNBs =
 (
 {
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -2,7 +2,6 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

-sa = 1;
 usrp-tx-thread-config = 1;
 tune-offset = 30720000;

@@ -21,7 +20,6 @@ gNBs =

    ////////// Physical parameters:

-    ssb_SubcarrierOffset  = 0;
    pdsch_AntennaPorts_XP = 2;
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
@@ -35,9 +33,9 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
+      # this is 4100.16 MHz
      absoluteFrequencySSB                                             = 673344;
-      # this is 3300.60 MHz
+      # this is 4071 MHz
      dl_absoluteFrequencyPointA                                       = 671400;
      dl_frequencyBand                                                 = 77;
      #scs-SpecificCarrierList
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.4x4.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.4x4.conf
@@ -1,23 +1,31 @@
-Active_gNBs = ( "gnb-l2sim-vnf");
+Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

+usrp-tx-thread-config = 1;
+tune-offset = 30720000;
+
 gNBs =
 (
 {
    ////////// Identification parameters:
    gNB_ID    =  0xe00;
-    gNB_name  =  "gnb-l2sim-vnf";
+    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 }) });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }) });

    nr_cellid = 12345678L;

    ////////// Physical parameters:

-    min_rxtxtime = 6;
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 4;
+    pdsch_AntennaPorts_N1 = 2;
+    maxMIMO_layers        = 4;
+    do_CSIRS              = 1;
+    do_SRS                = 1;

    servingCellConfigCommon = (
    {
@@ -27,44 +35,45 @@ gNBs =

 #  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;
+      # this is 4100.16 MHz
+      absoluteFrequencySSB                                             = 673344;
+      # this is 4071 MHz
+      dl_absoluteFrequencyPointA                                       = 671400;
+      dl_frequencyBand                                                 = 77;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
+        dl_carrierBandwidth                                            = 162;
     #initialDownlinkBWP
      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+       initialDLBWPlocationAndBandwidth                                        = 31624;
+       #
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
+        initialDLBWPsubcarrierSpacing                                           = 1;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
+        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPsearchSpaceZero                                             = 0;

  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
+      ul_frequencyBand                                                 = 77;
      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
+      ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 162;
      pMax                                                          = 20;
     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
+     #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 31624;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
+        initialULBWPsubcarrierSpacing                                           = 1;
      #rach-ConfigCommon
        #rach-ConfigGeneric
          prach_ConfigurationIndex                                  = 98;
@@ -72,7 +81,7 @@ gNBs =
 #0 = one, 1=two, 2=four, 3=eight
          prach_msg1_FDM                                            = 0;
          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
+          zeroCorrelationZoneConfig                                 = 12;
          preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
          preambleTransMax                                          = 6;
@@ -84,9 +93,9 @@ gNBs =
        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -110,7 +119,7 @@ gNBs =
 # 0 = neither, 1= group hopping, 2=sequence hopping
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
+        p0_nominal                                                  = -70;

      ssb_PositionsInBurst_Bitmap                                   = 1;

@@ -134,13 +143,13 @@ gNBs =
      # 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;
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 3;
      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
+      nrofUplinkSlots                                               = 1;
      nrofUplinkSymbols                                             = 4;

-      ssPBCH_BlockPower                                             = -25;
+  ssPBCH_BlockPower                                             = -25;
  }

  );
@@ -156,58 +165,85 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
-
+    amf_ip_address = ({ ipv4 = "192.168.61.132"; });

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.128";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.128";
-        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

  }
 );

 MACRLCs = (
-        {
-        num_cc = 1;
-        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";
-        }
+{
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 250;
+  pucch_TargetSNRx10          = 250;
+  pusch_FailureThres          = 100;
+  ul_max_mcs		      = 28;
+}
+);
+
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 120;
+  pusch_dtx_threshold = 20;
+  max_ldpc_iterations = 10;
+}
+);
+
+RUs = (
+{
+  local_rf       = "yes"
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 75;
+  eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000, 0x00007fff, 0x0000];
+  #clock_src = "internal";
+  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
+
+}
 );

 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
+  ciphering_algorithms = ( "nea1", "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" );
+  integrity_algorithms = ( "nia1", "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 = "yes";
 };

-     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";
-    };
+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.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -13,7 +13,6 @@ gNBs =
    tracking_area_code  =  1;
    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });

-    //nr_cellid = 12345678L;
    nr_cellid = 1;

    ////////// Physical parameters:
@@ -23,7 +22,7 @@ gNBs =
    maxMIMO_layers        = 2;
    pusch_AntennaPorts    = 4;
    do_CSIRS              = 1;
-    do_SRS                = 0 ;
+    do_SRS                = 0;

    pdcch_ConfigSIB1 = (
      {
@@ -38,10 +37,11 @@ gNBs =
      physCellId                                                    = 0;
 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
+      # center frequency = 3999.36 MHz
+      # selected SSB frequency = 3999.36 MHz
      absoluteFrequencySSB                                          = 666624;
      dl_frequencyBand                                              = 77;
-      # this is 3401.58 MHz
+      # frequency point A = 3950.22 MHz
      dl_absoluteFrequencyPointA                                    = 663348;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
@@ -186,8 +186,8 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
  pucch_TargetSNRx10          = 230;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
  pusch_FailureThres          = 100;
 }
 );
@@ -211,7 +211,7 @@ RUs = (
  local_rf       = "no";
  nb_tx          = 4;
  nb_rx          = 4;
-  att_tx         = 0
+  att_tx         = 0;
  att_rx         = 0;
  bands          = [77];
  max_pdschReferenceSignalPower = -27;
@@ -220,21 +220,11 @@ RUs = (
  eNB_instances  = [0];
  ru_thread_core = 5;
  sl_ahead       = 5;
-  clock_src = "internal";
  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
+  do_precoding   = 0; # needs to match O-RU configuration
 }
 );

-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
@@ -252,7 +242,8 @@ security = {
  drb_integrity = "no";
 };

-log_config : {
+log_config :
+{
  global_log_level = "info";
  hw_log_level     = "info";
  phy_log_level    = "info";
@@ -269,25 +260,16 @@ fhi_72 = {
  system_core = 0;
  io_core = 1;
  worker_cores = (2);
-  du_addr = ("76:76:64:6e:00:01", "76:76:64:6e:00:01");
  ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
-  mtu = 9216; # check if xran uses this properly
+  mtu = 9600;
  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (285, 429); # (min, max)
-    T2a_cp_ul = (285, 429); # (min, max)
-    T2a_up = (125, 428); # (min, max)
-    Ta3 = (130, 170); # (min, max)
-    T1a_cp_dl = (285, 470); # (min, max)
-    T1a_cp_ul = (285, 429); # (min, max)
-    T1a_up = (125, 350); # (min, max)
-    Ta4 = (110, 180); # (min, max)
+    T1a_cp_dl = (285, 470);
+    T1a_cp_ul = (285, 429);
+    T1a_up = (125, 350);
+    Ta4 = (110, 180);
    ru_config = {
      iq_width = 9;
      iq_width_prach = 9;
    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
  });
 };
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -2,7 +2,6 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

-sa = 1;
 usrp-tx-thread-config = 1;

 gNBs = (
@@ -32,10 +31,10 @@ gNBs = (

    # downlinkConfigCommon
      # frequencyInfoDL
-      # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
+      # this is 4100.16 MHz
      absoluteFrequencySSB                  = 673344;
      dl_frequencyBand                      = 77;
-      # this is 3900.60 MHz
+      # this is 4051.02 MHz
      dl_absoluteFrequencyPointA            = 670068;

      # scs-SpecificCarrierList
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -0,0 +1,239 @@
+Active_gNBs = ( "gnb-rfsim");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID = 0xe00;
+
+    gNB_name  =  "gnb-rfsim";
+
+    // 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; }) });
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+
+    min_rxtxtime = 6;
+
+    servingCellConfigCommon = (
+    {
+#spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+      #frequencyInfoDL
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+      absoluteFrequencySSB                                          = 621312;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                    = 620040;
+      #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=0,L=106 (275*(L-1))+RBstart
+      initialDLBWPlocationAndBandwidth                              = 28875;
+      # 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                                     = 12;
+      preambleReceivedTargetPower                                   = -104;
+      #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+      preambleTransMax                                              = 6;
+      #powerRampingStep
+      # 0=dB0,1=dB2,2=dB4,3=dB6
+      powerRampingStep                                              = 1;
+      #ra_ReponseWindow
+      #1,2,4,8,10,20,40,80
+      ra_ResponseWindow                                             = 4;
+      #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+      #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+      ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                  = 3;
+      #oneHalf (0..15) 4,8,12,16,...60,64
+      ssb_perRACH_OccasionAndCB_PreamblesPerSSB                     = 15;
+      #ra_ContentionResolutionTimer
+      #(0..7) 8,16,24,32,40,48,56,64
+      ra_ContentionResolutionTimer                                  = 7;
+      rsrp_ThresholdSSB                                             = 19;
+      #prach-RootSequenceIndex_PR
+      #1 = 839, 2 = 139
+      prach_RootSequenceIndex_PR                                    = 2;
+      prach_RootSequenceIndex                                       = 1;
+      # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+      #
+      msg1_SubcarrierSpacing                                        = 1,
+      # restrictedSetConfig
+      # 0=unrestricted, 1=restricted type A, 2=restricted type B
+      restrictedSetConfig                                           = 0,
+
+      msg3_DeltaPreamble                                            = 1;
+      p0_NominalWithGrant                                           = -90;
+
+      # pucch-ConfigCommon setup :
+      # pucchGroupHopping
+      # 0 = neither, 1= group hopping, 2=sequence hopping
+      pucchGroupHopping                                             = 0;
+      hoppingId                                                     = 40;
+      p0_nominal                                                    = -90;
+
+      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"; });
+
+    NETWORK_INTERFACES :
+    {
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.151";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.151";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc             = 1;
+    tr_s_preference    = "local_L1";
+    tr_n_preference    = "local_RRC";
+    pusch_TargetSNRx10 = 200;
+    pucch_TargetSNRx10 = 200;
+  }
+);
+
+L1s = (
+{
+  num_cc                = 1;
+  tr_n_preference       = "local_mac";
+  prach_dtx_threshold   = 200;
+#  pucch0_dtx_threshold = 150;
+}
+);
+
+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];
+       sf_extension                  = 0;
+       sdr_addrs                     = "serial=XXXXXXX";
+    }
+);
+
+rfsimulator: {
+    serveraddr = "server";
+};
+
+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";
+  f1ap_log_level                        ="info";
+};
+
+e2_agent = {
+  near_ric_ip_addr = "192.168.70.150";
+  #sm_dir = "/path/where/the/SMs/are/located/"
+  sm_dir = "/usr/local/lib/flexric/"
+};
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
@@ -22,9 +22,9 @@ gNBs =
    maxMIMO_layers        = 2;
    pusch_AntennaPorts    = 4;
    do_CSIRS              = 1;
-    do_SRS                = 0 ;
-    sib1_tda			  = 15;
-#    force_UL256qam_off    = 1;
+    do_SRS                = 0;
+    sib1_tda			        = 15;
+   # force_UL256qam_off    = 1;

    pdcch_ConfigSIB1 = (
      {
@@ -41,10 +41,11 @@ gNBs =
     # n_TimingAdvanceOffset                                         = 0;
 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
+      # center frequency = 3350.01 MHz
+      # selected SSB frequency = 3349.92 MHz
      absoluteFrequencySSB                                          = 623328;
      dl_frequencyBand                                              = 78;
-      # this is 3401.58 MHz
+      # frequency point A = 3300.87 MHz
      dl_absoluteFrequencyPointA                                    = 620052;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
@@ -189,10 +190,10 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 100;
  pucch_TargetSNRx10          = 200;
-  dl_bler_target_upper=.35;
-  dl_bler_target_lower=.15;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
+  dl_bler_target_upper        = .35;
+  dl_bler_target_lower        = .15;
+  ul_bler_target_upper        = .35;
+  ul_bler_target_lower        = .15;
  pusch_FailureThres          = 1000;
  ul_max_mcs                  = 28;
 }
@@ -218,7 +219,7 @@ RUs = (
  local_rf       = "no";
  nb_tx          = 4;
  nb_rx          = 4;
-  att_tx         = 0
+  att_tx         = 0;
  att_rx         = 0;
  bands          = [78];
  max_pdschReferenceSignalPower = -27;
@@ -228,7 +229,7 @@ RUs = (
  ru_thread_core = 5;
  sl_ahead       = 10;
  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
+  do_precoding   = 0; # needs to match O-RU configuration
 }
 );

@@ -251,15 +252,15 @@ security = {

 log_config :
 {
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+  ngap_log_level   = "info";
+  f1ap_log_level   = "info";
 };

 fhi_72 = {
@@ -267,16 +268,9 @@ fhi_72 = {
  system_core = 0;
  io_core = 1;
  worker_cores = (2);
-  du_addr = ("00:11:22:33:44:66", "00:11:22:33:44:67");
  ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
-  file_prefix = "fhi_72";
+  mtu = 9600;
  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (259, 500);
-    T2a_cp_ul = (25, 500);
-    T2a_up = (134, 375);
-    Ta3 = (152, 160);
    T1a_cp_dl = (419, 470);
    T1a_cp_ul = (285, 336);
    T1a_up = (294, 345);
@@ -285,8 +279,5 @@ fhi_72 = {
      iq_width = 9;
      iq_width_prach = 9;
    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
  });
 };
--- a/ci-scripts/conf_files/nrue.uicc.conf
+++ b/ci-scripts/conf_files/nrue.uicc.conf
@@ -6,6 +6,8 @@ uicc0 = {
  nssai_sst=1;
 }

+thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
--- a/ci-scripts/conf_files/nrue.uicc.yaml
+++ b/ci-scripts/conf_files/nrue.uicc.yaml
@@ -5,11 +5,13 @@ uicc0:
  dnn: oai
  nssai_sst: 1

+thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
 channelmod:
-  max_chan: 10;
+  max_chan: 10
  modellist: modellist_rfsimu_1
  modellist_rfsimu_1:
    - model_name: rfsimu_channel_enB0
--- a/ci-scripts/conf_files/ue.sa.conf
+++ b/ci-scripts/conf_files/ue.sa.conf
@@ -6,3 +6,5 @@ uicc0 = {
  nssai_sst=1;
  nssai_sd=66051;
 }
+
+thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -1,7 +1,6 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
-Num_Threads_PUSCH = 8;

 gNBs =
 (
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -11,10 +11,10 @@ Ref :
  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
-  PUSCH inner-receiver : 150.0
+  L1 Tx processing : 200.0
+  DLSCH encoding : 100.0
+  L1 Rx processing : 330.0
+  PUSCH inner-receiver : 120.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 6.0
  UL Indication : 3.0
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -39,14 +39,12 @@ import constants as CONST


 import cls_oaicitest		 #main class for OAI CI test framework
-import cls_physim		 #class PhySim for physical simulators build and test
 import cls_containerize	 #class Containerize for all container-based operations on RAN/UE objects
 import cls_static_code_analysis  #class for static code analysis
 import cls_physim1		 #class PhySim for physical simulators deploy and run
 import cls_cluster		 # class for building/deploying on cluster
 import cls_native        # class for all native/source-based operations

-import sshconnection 
 import epc
 import ran
 import cls_oai_html
@@ -87,7 +85,6 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp

-
 #assigning parameters to object instance attributes (even if the attributes do not exist !!)
 def AssignParams(params_dict):

@@ -95,12 +92,8 @@ def AssignParams(params_dict):
 		setattr(CiTestObj, key, value)
 		setattr(RAN, key, value)
 		setattr(HTML, key, value)
-		setattr(ldpc, key, value)
-
-

 def ExecuteActionWithParam(action):
-	global SSH
 	global EPC
 	global RAN
 	global HTML
@@ -108,7 +101,6 @@ def ExecuteActionWithParam(action):
 	global SCA
 	global PHYSIM
 	global CLUSTER
-	global ldpc
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
@@ -289,18 +281,6 @@ def ExecuteActionWithParam(action):
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
 		success = cls_oaicitest.IdleSleep(HTML, int(st))

-	elif action == 'Build_PhySim':
-		ldpc.buildargs  = test.findtext('physim_build_args')
-		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
-		if (forced_workspace_cleanup is None):
-			ldpc.forced_workspace_cleanup=False
-		else:
-			if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
-				ldpc.forced_workspace_cleanup=True
-			else:
-				ldpc.forced_workspace_cleanup=False
-		success = ldpc.Build_PhySim(HTML,CONST)
-
 	elif action == 'Deploy_Run_PhySim':
 		success = PHYSIM.Deploy_PhySim(HTML)

@@ -369,6 +349,7 @@ def ExecuteActionWithParam(action):
 		string_field = test.findtext('services')
 		if string_field is not None:
 			CONTAINERS.services[CONTAINERS.eNB_instance] = string_field
+		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(HTML)
@@ -377,16 +358,11 @@ def ExecuteActionWithParam(action):
 		elif action == 'Create_Workspace':
 			success = CONTAINERS.Create_Workspace(HTML)

-	elif action == 'Run_CUDATest' or action == 'Run_NRulsimTest' or action == 'Run_T2Test':
-		ldpc.runargs = test.findtext('physim_run_args')
-		ldpc.runsim = test.findtext('physim_run')
-		ldpc.timethrs = test.findtext('physim_time_threshold')
-		if action == 'Run_CUDATest':
-			success = ldpc.Run_CUDATest(HTML,CONST,id)
-		elif action == 'Run_NRulsimTest':
-			success = ldpc.Run_NRulsimTest(HTML,CONST,id)
-		elif action == 'Run_T2Test':
-			success = ldpc.Run_T2Test(HTML,CONST,id)
+	elif action == 'Run_Physim':
+		physim_options = test.findtext('physim_run_args')
+		physim_test = test.findtext('physim_test')
+		physim_threshold = test.findtext('physim_time_threshold') or 'inf'
+		success = cls_native.Native.Run_Physim(HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)

 	elif action == 'LicenceAndFormattingCheck':
 		success = SCA.LicenceAndFormattingCheck(HTML)
@@ -395,26 +371,20 @@ def ExecuteActionWithParam(action):
 		success = SCA.CppCheckAnalysis(HTML)

 	elif action == 'Push_Local_Registry':
-		string_field = test.findtext('registry_svr_id')
-		if (string_field is not None):
-			CONTAINERS.registrySvrId = string_field
-		success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+		svr_id = test.findtext('svr_id')
+		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id)

-	elif action == 'Pull_Local_Registry':
-		string_field = test.findtext('test_svr_id')
-		if (string_field is not None):
-			CONTAINERS.testSvrId = string_field
-		CONTAINERS.imageToPull.clear()
-		string_field = test.findtext('images_to_pull')
-		if (string_field is not None):
-			CONTAINERS.imageToPull = string_field.split()
-		success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
-
-	elif action == 'Clean_Test_Server_Images':
-		string_field = test.findtext('test_svr_id')
-		if (string_field is not None):
-			CONTAINERS.testSvrId = string_field
-		success = CONTAINERS.Clean_Test_Server_Images(HTML)
+	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
+		svr_id = test.findtext('svr_id')
+		images = test.findtext('images').split()
+		# hack: for FlexRIC, we need to overwrite the tag to use
+		tag = None
+		if len(images) == 1 and images[0] == "oai-flexric":
+			tag = CONTAINERS.flexricTag
+		if action == "Pull_Local_Registry":
+			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag)
+		if action == "Clean_Test_Server_Images":
+			success = CONTAINERS.Clean_Test_Server_Images(HTML, svr_id, images, tag=tag)

 	elif action == 'Custom_Command':
 		node = test.findtext('node')
@@ -429,13 +399,9 @@ def ExecuteActionWithParam(action):
 		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)

 	elif action == 'Pull_Cluster_Image':
-		string_field = test.findtext('images_to_pull')
-		if (string_field is not None):
-			CLUSTER.imageToPull = string_field.split()
-		string_field = test.findtext('test_svr_id')
-		if (string_field is not None):
-			CLUSTER.testSvrId = string_field
-		success = CLUSTER.PullClusterImage(HTML, RAN)
+		images = test.findtext('images').split()
+		node = test.findtext('node')
+		success = CLUSTER.PullClusterImage(HTML, node, images)

 	else:
 		logging.warning(f"unknown action {action}, skip step")
@@ -484,7 +450,6 @@ mode = ''

 CiTestObj = cls_oaicitest.OaiCiTest()
 
-SSH = sshconnection.SSHConnection()
 EPC = epc.EPCManagement()
 RAN = ran.RANManagement()
 HTML = cls_oai_html.HTMLManagement()
@@ -493,15 +458,12 @@ SCA = cls_static_code_analysis.StaticCodeAnalysis()
 PHYSIM = cls_physim1.PhySim()
 CLUSTER = cls_cluster.Cluster()

-ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU build
-
-
 #-----------------------------------------------------------
 # Parsing Command Line Arguments
 #-----------------------------------------------------------

 import args_parse
-py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)
+py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)



@@ -663,7 +625,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	#(6 digits or less than 6 digits followed by +)
 	for test in exclusion_tests:
 		if     (not re.match('^[0-9]{6}$', test) and
-				not re.match('^[0-9]{1,5}\+$', test)):
+				not re.match('^[0-9]{1,5}\\+$', test)):
 			logging.error('exclusion test is invalidly formatted: ' + test)
 			sys.exit(1)
 		else:
@@ -674,7 +636,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	#be verbose
 	for test in requested_tests:
 		if     (re.match('^[0-9]{6}$', test) or
-				re.match('^[0-9]{1,5}\+$', test)):
+				re.match('^[0-9]{1,5}\\+$', test)):
 			logging.info('test group/case requested: ' + test)
 		else:
 			logging.error('requested test is invalidly formatted: ' + test)
@@ -696,26 +658,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re

 	HTML.CreateHtmlTabHeader()

-	# On CI bench w/ containers, we need to validate if IP routes are set
-	if EPC.IPAddress == '172.21.16.136':
-		CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password)
-	if EPC.IPAddress == '172.21.16.137':
-		CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password)
-	if CONTAINERS.eNBIPAddress == '172.21.16.127':
-		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
-	if CONTAINERS.eNB1IPAddress == '172.21.16.127':
-		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
-	if CONTAINERS.eNBIPAddress == '172.21.16.128':
-		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
-	if CONTAINERS.eNB1IPAddress == '172.21.16.128':
-		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
-	if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot':
-		CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
-	if CONTAINERS.eNBIPAddress == '172.21.16.137':
-		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
-	if CONTAINERS.eNB1IPAddress == '172.21.16.137':
-		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
-
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))

--- a/ci-scripts/scripts/create_workspace.sh
+++ b/ci-scripts/scripts/create_workspace.sh
@@ -15,7 +15,7 @@ ref=$3
 merge=$4

 rm -rf ${dir}
-git clone --filter=blob:none -n -b develop ${repo} ${dir}
+git clone --filter=blob:none -n ${repo} ${dir}
 cd ${dir}
 git config user.email "jenkins@openairinterface.org"
 git config user.name "OAI Jenkins"
--- a/ci-scripts/tests/README.md
+++ b/ci-scripts/tests/README.md
@@ -3,18 +3,28 @@ scripts.

 # Unit test

-There are some unit tests. From the parent directory, i.e., `ci-scripts/`,
-start with
+This repository contains unit tests. To run them, switch to the parent
+directory, i.e., `ci-scripts/`, and run

+    python3 -m unittest tests/*.py
+
+To run individual unit tests, start them like so:
+
+    python tests/build.py -v
+    python tests/cmd.py -v
    python tests/deployment.py -v
-    python tests/ping-iperf.py -v
    python tests/iperf-analysis.py -v
+    python tests/ping-iperf.py -v

-It will indicate if all tests passed. It assumes that these images are present:
+The logs will indicate if all tests passed. `tests/deployment.py` requires
+these images to be present:

 - `oai-ci/oai-nr-ue:develop-12345678`
 - `oai-ci/oai-gnb:develop-12345678`

+It will try to download `oaisoftwarealliance/oai-{gnb,nr-ue}:develop`
+automatically and retag the images.
+
 # test-runner test

 This is not a true test, because the results need to be manually inspected. To
--- a/ci-scripts/tests/build.py
+++ b/ci-scripts/tests/build.py
@@ -0,0 +1,40 @@
+import sys
+import logging
+logging.basicConfig(
+	level=logging.DEBUG,
+	stream=sys.stdout,
+	format="[%(asctime)s] %(levelname)8s: %(message)s"
+)
+import unittest
+import tempfile
+
+sys.path.append('./') # to find OAI imports below
+import cls_oai_html
+import cls_containerize
+import cls_cmd
+
+class TestBuild(unittest.TestCase):
+	def setUp(self):
+		self.html = cls_oai_html.HTMLManagement()
+		self.html.testCase_id = "000000"
+		self.cont = cls_containerize.Containerize()
+		self.cont.eNB_serverId[0] = '0'
+		self.cont.eNBIPAddress = 'localhost'
+		self.cont.eNBUserName = None
+		self.cont.eNBPassword = None
+		self._d = tempfile.mkdtemp()
+		logging.warning(f"temporary directory: {self._d}")
+		self.cont.eNBSourceCodePath = self._d
+
+	def tearDown(self):
+		logging.warning(f"removing directory contents")
+		with cls_cmd.getConnection(None) as cmd:
+			cmd.run(f"rm -rf {self._d}")
+
+	def test_build_proxy(self):
+		self.cont.proxyCommit = "b64d9bce986b38ca59e8582864ade3fcdd05c0dc"
+		success = self.cont.BuildProxy(self.html)
+		self.assertTrue(success)
+
+if __name__ == '__main__':
+	unittest.main()
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -15,9 +15,24 @@ import cls_oai_html
 import cls_oaicitest
 import cls_containerize
 import ran
+import cls_cmd

 class TestDeploymentMethods(unittest.TestCase):
+	def _pull_image(self, cmd, image):
+		ret = cmd.run(f"docker inspect oai-ci/{image}:develop-12345678")
+		if ret.returncode == 0: # exists
+			return
+		ret = cmd.run(f"docker pull oaisoftwarealliance/{image}:develop")
+		self.assertEqual(ret.returncode, 0)
+		ret = cmd.run(f"docker tag oaisoftwarealliance/{image}:develop oai-ci/{image}:develop-12345678")
+		self.assertEqual(ret.returncode, 0)
+		ret = cmd.run(f"docker rmi oaisoftwarealliance/{image}:develop")
+		self.assertEqual(ret.returncode, 0)
+
 	def setUp(self):
+		with cls_cmd.getConnection("localhost") as cmd:
+			self._pull_image(cmd, "oai-gnb")
+			self._pull_image(cmd, "oai-nr-ue")
 		self.html = cls_oai_html.HTMLManagement()
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
@@ -32,6 +47,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.eNBUserName = None
 		self.cont.eNBPassword = None
 		self.cont.eNBSourceCodePath = os.getcwd()
+		self.cont.num_attempts = 3

 	def test_deploy(self):
 		self.cont.yamlPath[0] = 'tests/simple-dep/'
@@ -50,6 +66,15 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old

+	def test_deployfails_2svc(self):
+		# fails reliably
+		old = self.cont.yamlPath
+		self.cont.yamlPath[0] = 'tests/simple-fail-2svc/'
+		deploy = self.cont.DeployObject(self.html)
+		self.cont.UndeployObject(self.html, self.ran)
+		self.assertFalse(deploy)
+		self.cont.yamlPath = old
+
 	def test_deploy_ran(self):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb"
--- a/ci-scripts/tests/pull-clean-int-registry.py
+++ b/ci-scripts/tests/pull-clean-int-registry.py
@@ -0,0 +1,53 @@
+import sys
+import logging
+logging.basicConfig(
+	level=logging.DEBUG,
+	stream=sys.stdout,
+	format="[%(asctime)s] %(levelname)8s: %(message)s"
+)
+import os
+os.system(f'rm -rf cmake_targets')
+os.system(f'mkdir -p cmake_targets/log')
+import unittest
+
+sys.path.append('./') # to find OAI imports below
+import cls_oai_html
+import cls_cmd
+import cls_containerize
+
+class TestDeploymentMethods(unittest.TestCase):
+	def setUp(self):
+		self.html = cls_oai_html.HTMLManagement()
+		self.html.testCaseId = "000000"
+		self.cont = cls_containerize.Containerize()
+		self.cont.eNBIPAddress = 'localhost'
+		self.cont.eNBSourceCodePath = os.getcwd()
+
+	def test_pull_clean_local_reg(self):
+		# the pull function has the authentication at the internal cluster hardcoded
+		# this is a refactoring opportunity: we should do it in a separate step
+		# and allow to have pull work with any registry
+		registry = "porcepix.sboai.cs.eurecom.fr"
+		with cls_cmd.getConnection("localhost") as cmd:
+			ret = cmd.run(f"ping -c1 -w1 {registry}")
+			if ret.returncode != 0: # could not ping once -> skip test
+				self.skipTest(f"test_pull_clean_local_reg: could not reach {registry} (run inside sboai)")
+		svr_id = '0'
+		images = ["oai-gnb"]
+		tag = "develop"
+		pull = self.cont.Pull_Image_from_Registry(self.html, svr_id, images, tag=tag)
+		clean = self.cont.Clean_Test_Server_Images(self.html, svr_id, images, tag=tag)
+		self.assertTrue(pull)
+		self.assertTrue(clean)
+
+	def test_pull_clean_docker_hub(self):
+		svr_id = '0'
+		r = "docker.io"
+		images = ["hello-world"]
+		tag = "latest"
+		pull = self.cont.Pull_Image_from_Registry(self.html, svr_id, images, tag=tag, registry=r, username=None, password=None)
+		clean = self.cont.Clean_Test_Server_Images(self.html, svr_id, images, tag=tag)
+		self.assertTrue(pull)
+		self.assertTrue(clean)
+
+if __name__ == '__main__':unittest.main()
--- a/ci-scripts/tests/simple-fail-2svc/docker-compose.yml
+++ b/ci-scripts/tests/simple-fail-2svc/docker-compose.yml
@@ -0,0 +1,23 @@
+services:
+  test1:
+    image: ubuntu:jammy
+    container_name: test_container1
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "false"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1
+  test2:
+    image: ubuntu:jammy
+    container_name: test_container2
+    cap_drop:
+      - ALL
+    entrypoint: /bin/bash -c "sleep infinity"
+    healthcheck:
+      test: /bin/bash -c "true"
+      interval: 1s
+      timeout: 1s
+      retries: 1
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,10 +1,7 @@
  - Build_Proxy
  - Build_Cluster_Image
  - Pull_Cluster_Image
-  - Build_PhySim
-  - Run_CUDATest
-  - Run_T2Test
-  - Run_NRulsimTest
+  - Run_Physim
  - Build_eNB
  - Initialize_eNB
  - Terminate_eNB
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -44,8 +44,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb oai-lte-ue</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -149,7 +149,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb oai-lte-ue</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -52,8 +52,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

        <testCase id="000011">
@@ -166,7 +166,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -43,8 +43,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -137,7 +137,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -47,8 +47,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -166,7 +166,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -47,8 +47,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -166,7 +166,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
@@ -40,8 +40,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -104,7 +104,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
@@ -40,8 +40,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -104,7 +104,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb-asan oai-lte-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -47,8 +47,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-enb oai-lte-ue</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -159,7 +159,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-enb oai-lte-ue</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -40,8 +40,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -107,7 +107,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb oai-nr-cuup oai-nr-ue</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -34,6 +34,17 @@
 030020
 030021
 030022
+ 040001
+ 020022
+ 040002
+ 030021
+ 030022
+ 040021
+ 000030
+ 040022
+ 040023
+ 020022
+ 040024
 100021
 222222
        </TestCaseRequestedList>
@@ -42,8 +53,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -69,6 +80,12 @@
                <eNB_serverId>0</eNB_serverId>
        </testCase>

+        <testCase id="000030">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+        </testCase>
+
        <testCase id="000023">
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
@@ -117,11 +134,36 @@
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

+        <testCase id="040001">
+                <class>Custom_Command</class>
+                <desc>Trigger Reestablishment</desc>
+                <node>cacofonix</node>
+                <command>echo ci force_reestab | nc 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
+        <testCase id="020022">
+                <class>Ping</class>
+                <desc>Ping ext-dn from all NR-UEs</desc>
+                <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
+                <ping_args> -c 20 192.168.72.135 -i0.5 -w25</ping_args>
+                <ping_packetloss_threshold>80</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="040002">
+                <class>Custom_Command</class>
+                <desc>Verify Reestablishment</desc>
+                <node>cacofonix</node>
+                <command>echo ci get_reestab_count | nc 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
        <testCase id="040021">
                <class>Custom_Command</class>
-                <desc>Simulate a disruption of DL radio channel (ploss 55)(5 sec)</desc>
+                <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
                <node>cacofonix</node>
-                <command>echo channelmod modify 0 ploss 55 | nc -N 192.168.71.181 8091 &amp;&amp; sleep 5</command>
+                <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -129,15 +171,15 @@
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
                <node>cacofonix</node>
-                <command>echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
                <command_fail>yes</command_fail>
        </testCase>

        <testCase id="040023">
                <class>Custom_Command</class>
-                <desc>Restoration of the original DL channel conditions (ploss 0)(5 sec)</desc>
+                <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
                <node>cacofonix</node>
-                <command>echo channelmod modify 0 ploss 0 | nc -N 192.168.71.181 8091 &amp;&amp; sleep 5</command>
+                <command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -145,7 +187,7 @@
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
                <node>cacofonix</node>
-                <command>echo ciUE sync_state 0 | nc -N 192.168.71.181 8091 | grep -E UE_CONNECTED &amp;&amp; sleep 10</command>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
                <command_fail>yes</command_fail>
        </testCase>

@@ -154,8 +196,8 @@
                <always_exec>true</always_exec>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <d_retx_th>30,30,100,100</d_retx_th>
-                <u_retx_th>30,30,100,100</u_retx_th>
+                <d_retx_th>30,100,100,100</d_retx_th>
+                <u_retx_th>30,100,100,100</u_retx_th>
                <eNB_instance>0</eNB_instance>
                <eNB_serverId>0</eNB_serverId>
        </testCase>
@@ -164,7 +206,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -42,8 +42,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -133,7 +133,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
@@ -0,0 +1,213 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-flexric</htmlTabRef>
+        <htmlTabName>Monolithic SA TDD gNB and FlexRic Integration</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 111110
+ 111111
+ 111112
+ 000001
+ 000002
+ 000003
+ 002001
+ 010000
+ 000004
+ 333333
+ 010001
+ 010002
+ 010003
+ 020005
+ 010013
+ 002006
+ 444444
+ 100002
+ 100001
+ 222221
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="002001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
+
+        <testCase id="111110">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <svr_id>0</svr_id>
+                <images>oai-gnb oai-nr-ue</images>
+        </testCase>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <svr_id>0</svr_id>
+                <images>oai-flexric</images>
+        </testCase>
+
+        <testCase id="222221">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <svr_id>0</svr_id>
+                <images>oai-gnb oai-nr-ue</images>
+                <always_exec>true</always_exec>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <svr_id>0</svr_id>
+                <images>oai-flexric</images>
+                <always_exec>true</always_exec>
+        </testCase>
+
+        <testCase id="111112">
+                <class>Custom_Command</class>
+                <desc>Updating CN5G images</desc>
+                <node>localhost</node>
+                <command>docker compose -f ../doc/tutorial_resources/oai-cn5g/docker-compose.yaml pull</command>
+        </testCase>
+
+        <testCase id="000001">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G CoreNetwork</desc>
+                <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
+                <services>mysql oai-nrf oai-udr oai-udm oai-ausf oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000002">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI FlexRIC</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+                <services>oai-flexric</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000003">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G gNB in RF sim SA</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+                <services>oai-gnb</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000004">
+                <class>Deploy_Object</class>
+                <desc>Deploy 2 OAI 5G NR-UEs in RF sim SA</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+                <services>oai-nr-ue oai-nr-ue2</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="020005">
+                <class>Ping</class>
+                <desc>Ping ext-dn from both UEs</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>selfix selfix</nodes>
+                <ping_args>-c 20 192.168.70.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="333333">
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>selfix selfix</nodes>
+        </testCase>
+
+        <testCase id="444444">
+                <class>Detach_UE</class>
+                <desc>Detach OAI UE 1 and 2</desc>
+                <id>rfsim5g_ue rfsim5g_ue2</id>
+                <nodes>selfix selfix</nodes>
+        </testCase>
+
+        <testCase id="100001">
+                <class>Undeploy_Object</class>
+                <desc>Undeploy Core Network</desc>
+                <yaml_path>doc/tutorial_resources/oai-cn5g</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+                <always_exec>true</always_exec>
+        </testCase>
+
+        <testCase id="100002">
+                <class>Undeploy_Object</class>
+                <desc>Undeploy RAN and Flexric</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+                <always_exec>true</always_exec>
+        </testCase>
+
+        <testCase id="010000">
+                <class>Custom_Command</class>
+                <desc>RC monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/rc-moni-010000.log</command>
+        </testCase>
+
+        <testCase id="010001">
+                <class>Custom_Command</class>
+                <desc>KPM monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm-moni-010001.log</command>
+        </testCase>
+
+        <testCase id="010002">
+                <class>Custom_Command</class>
+                <desc>KPM monitoring and RC control</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm_rc-010002.log</command>
+        </testCase>
+
+        <testCase id="010003">
+                <class>Custom_Command</class>
+                <desc>Custom SMs monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010003.log</command>
+        </testCase>
+
+        <testCase id="010013">
+                <class>Custom_Command</class>
+                <desc>Custom SMs monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010013.log</command>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -1,133 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>l2sim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Testing 5G NR L2 sim - TDD gNB</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000000
- 000001
- 000002
- 000003
- 000004
- 020001
- 020002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-        <testCase id="000000">
-                <class>Deploy_Object</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>mysql</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB L2 sim SA</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-gnb</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>proxy oai-nr-ue0</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000004">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE</desc>
-                <id>l2sim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
-
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>l2sim5g_ue</id>
-                <nodes>localhost</nodes>
-                <ping_args> -c 20 192.168.72.135</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>l2sim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <ping_args>-c 20 12.1.1.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_l2sim_tdd</yaml_path>
-                <d_retx_th>20,50,100,100</d_retx_th>
-                <u_retx_th>0,0,0,0</u_retx_th>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -57,8 +57,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -259,7 +259,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -42,8 +42,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -133,7 +133,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -42,8 +42,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -133,7 +133,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -1,92 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-f1-accelleran</htmlTabRef>
-        <htmlTabName>F1 DU Interop Accelleran CU</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000020
- 000021
- 020021
- 100021
- 100022
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-        <testCase id="000020">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI-DU+nrUE</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-du oai-nr-ue</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="000021">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>ofqot</nodes>
-        </testCase>
-
-        <testCase id="020021">
-                <class>Ping</class>
-                <desc>Test Connectivity (ping)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>ofqot</nodes>
-                <ping_args>-c 20 12.1.1.1</ping_args>
-                <ping_packetloss_threshold>0</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="100022">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
-        </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -42,8 +42,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

        <testCase id="004000">
@@ -133,7 +133,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -39,8 +39,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

        <testCase id="800813">
@@ -101,7 +101,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
@@ -41,8 +41,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

        <testCase id="800813">
@@ -107,7 +107,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
@@ -39,8 +39,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-nr-ue-asan</images>
        </testCase>

        <testCase id="800813">
@@ -97,7 +97,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -41,8 +41,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

        <testCase id="004000">
@@ -116,7 +116,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -42,8 +42,8 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -133,7 +133,8 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <test_svr_id>0</test_svr_id>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/ci-scripts/xml_files/container_image_build.xml
@@ -49,7 +49,7 @@
 	<testCase id="000010">
 		<class>Push_Local_Registry</class>
 		<desc>Push Images to Local Registry</desc>
-		<registry_svr_id>0</registry_svr_id>
+		<svr_id>0</svr_id>
 	</testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -25,17 +25,10 @@
        <htmlTabName>Build L2sim proxy image</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
- 100001
 000001
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>

-        <testCase id="100001">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <eNB_instance>1</eNB_instance>
-                <eNB_serverId>1</eNB_serverId>
-        </testCase>
        <testCase id="000001">
                <class>Build_Proxy</class>
                <desc>Build L2sim Proxy Image</desc>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="100000">
@@ -211,7 +211,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -42,8 +42,8 @@
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="100000">
@@ -194,7 +194,8 @@
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
        <class>Custom_Command</class>
@@ -176,7 +176,8 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -44,8 +44,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
        <class>Custom_Command</class>
@@ -206,7 +206,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
@@ -138,7 +138,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
@@ -49,14 +49,14 @@
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="111111">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>1</test_svr_id>
-        <images_to_pull>oai-lte-ue</images_to_pull>
+        <svr_id>1</svr_id>
+        <images>oai-lte-ue</images>
    </testCase>
    <testCase id="100000">
        <class>Custom_Command</class>
@@ -190,14 +190,16 @@
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on eNB Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="333333">
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on LTE-UE Test Server</desc>
-        <test_svr_id>1</test_svr_id>
+        <svr_id>1</svr_id>
+        <images>oai-lte-ue</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
@@ -206,7 +206,8 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -43,8 +43,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="100000">
@@ -223,7 +223,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -41,8 +41,8 @@
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="100000">
@@ -209,7 +209,8 @@
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -41,8 +41,8 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
        <class>Custom_Command</class>
@@ -214,7 +214,8 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>
    <testCase id="100000">
            <class>Custom_Command</class>
@@ -212,7 +212,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -42,8 +42,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
    <testCase id="111110">
        <class>Pull_Local_Registry</class>
        <desc>Pull Images from Local Registry</desc>
-        <test_svr_id>0</test_svr_id>
-        <images_to_pull>oai-enb</images_to_pull>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

    <testCase id="100000">
@@ -217,7 +217,8 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images on Test Server</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -48,8 +48,8 @@
  <testCase id="111111">
    <class>Pull_Local_Registry</class>
    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-enb</images_to_pull>
+    <svr_id>0</svr_id>
+    <images>oai-enb</images>
  </testCase>

  <testCase id="100000">
@@ -153,7 +153,8 @@
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -48,8 +48,8 @@
  <testCase id="111111">
    <class>Pull_Local_Registry</class>
    <desc>Pull Images from Local Registry</desc>
-    <test_svr_id>0</test_svr_id>
-    <images_to_pull>oai-enb</images_to_pull>
+    <svr_id>0</svr_id>
+    <images>oai-enb</images>
  </testCase>

  <testCase id="100000">
@@ -153,7 +153,8 @@
        <class>Clean_Test_Server_Images</class>
        <always_exec>true</always_exec>
        <desc>Clean Test Images</desc>
-        <test_svr_id>0</test_svr_id>
+        <svr_id>0</svr_id>
+        <images>oai-enb</images>
    </testCase>


--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -57,15 +57,15 @@
 	<testCase id="111110">
 		<class>Pull_Local_Registry</class>
 		<desc>Pull Images from Local Registry</desc>
-		<test_svr_id>0</test_svr_id>
-		<images_to_pull>oai-enb</images_to_pull>
+		<svr_id>0</svr_id>
+		<images>oai-enb</images>
 	</testCase>

 	<testCase id="111111">
 		<class>Pull_Local_Registry</class>
 		<desc>Pull Images from Local Registry</desc>
-		<test_svr_id>1</test_svr_id>
-		<images_to_pull>oai-gnb</images_to_pull>
+		<svr_id>1</svr_id>
+		<images>oai-gnb</images>
 	</testCase>

 	<testCase id = "100000">
@@ -252,14 +252,16 @@
 		<class>Clean_Test_Server_Images</class>
    <always_exec>true</always_exec>
 		<desc>Clean Test Images on Test Server</desc>
-		<test_svr_id>0</test_svr_id>
+		<svr_id>0</svr_id>
+		<images>oai-enb</images>
 	</testCase>

 	<testCase id="222221">
 		<class>Clean_Test_Server_Images</class>
    <always_exec>true</always_exec>
 		<desc>Clean Test Images on Test Server</desc>
-		<test_svr_id>1</test_svr_id>
+		<svr_id>1</svr_id>
+		<images>oai-gnb</images>
 	</testCase>

 </testCaseList>
--- a/Show More
+++ b/Show More