added test_scm_stability

2026-07-15 13:40:29 +00:00 · 2025-08-26 12:36:41 +00:00
647 changed files with 18648 additions and 31028 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,51 +1,5 @@
 # RELEASE NOTES: #

-## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
-
-General new features and improvements (both RAN and UE):
- Preliminary support for RedCap UEs
- Support for NTN LEO scenarios including SIB19 and channel emulation (see
-  doc/RUNMODEM.md)
- VRTSIM: new shared memory realtime radio (see develop/radio/vrtsim/README.md)
- Support for TDD pattern 2
- Support for long PRACH
- Support for SIB2
- Add unit tests using ctest (see doc/UnitTests.md)
-
-Stability and bug fixes:
- Improve various procedures (e.g., RRC reestablishment, RRC Reject, ...)
- Add improvements for ImScope
- Bugfixes in the entire stack (e.g., #803, #805, #810, #812, #818, #852, #878,
-  #884, #890, #895, #901, #907, #932, #939 ...)
- Documentation updates
- And many other small fixes, like memory leaks, crashes, ...
-
-RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
- Stability and performance improvements when running with 4-layer DL MIMO
- Stability and performance improvements when running with 2-layer UL MIMO
- Interoperability testing with Metanoia Jura and Foxconn RUs
- Support of O-RAN 7.2 M-plane (Start-up procedure including configuration
-  management, see also doc/ORAN_FHI7.2_Tutorial.md)
- Upgrade OSC FHI (xran) from E to F release
- Refactoring of LDPC interface and performance improvements
- Support for nFAPI in all scenarios for FR1 (see doc/nfapi.md)
- Support at least 32 UEs concurrently
- Improve robustness when running in split modes (F1, E1)
- Add basic support for beam management in FR2
- Add support for O1 on DU (see also https://gitlab.eurecom.fr/oai/o1-adapter)
- E2 agent: Support for multiple E2SM-RC report service styles
-
-nrUE changes:
- Refactoring of threading towards better code and performance
- Add or rework various procedures (e.g., RA with C-RNTI, Going to Idle, RA, ...)
- Refactor and extend NAS implementation (e.g., Service Request, Registration
-  Request, Service Acept, Service Reject, ...)
- Support for continuous frequency offset compensation
- Reduce minimum RX-to-TX time to 3
-
-Regression:
- Multiple BWPs do not work reliably on gNB; use tag 2025.w17
-
 ## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##

 General 5G improvements (both gNB and UE):
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,8 @@
 # *      contact@openairinterface.org
 # */

+# Author: laurent THOMAS, Lionel GAUTHIER
+
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
@@ -168,9 +170,12 @@ endif()
 if (NOT CROSS_COMPILE)
  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")
 else ()
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8.2-a")
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8-a")
 endif()

+# add autotools definitions that were maybe used!
+add_definitions(-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP)
+
 # we need -rdynamic to incorporate all symbols in shared objects, see man page
 set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
 # GNU C/C++ Compiler might throw many warnings without packed-bitfield-compat, see man page
@@ -282,7 +287,7 @@ add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
 if (TRACY_ENABLE)
  # the tracy version here should match the tracy server version
  # below is latest release as of this commit
-  CPMAddPackage("gh:wolfpld/tracy#v0.12.2")
+  CPMAddPackage("gh:wolfpld/tracy#0.12.2")
 endif()

 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
@@ -358,7 +363,6 @@ add_library(ngap
  ${NGAP_DIR}/ngap_gNB.c
  ${NGAP_DIR}/ngap_common.c
  ${NGAP_DIR}/ngap_gNB_context_management_procedures.c
-  ${NGAP_DIR}/ngap_gNB_mobility_management.c
  ${NGAP_DIR}/ngap_gNB_decoder.c
  ${NGAP_DIR}/ngap_gNB_encoder.c
  ${NGAP_DIR}/ngap_gNB_handlers.c
@@ -464,6 +468,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(f1ap PRIVATE E2_AGENT)
+endif()

 # LPP
 ##############
@@ -541,6 +548,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories("${OPENAIR_DIR}/executables")
 include_directories("${OPENAIR2_DIR}/COMMON")
 include_directories("${OPENAIR2_DIR}/UTIL")
+include_directories("${OPENAIR2_DIR}/UTIL/LOG")
 include_directories("${OPENAIR3_DIR}/COMMON")
 include_directories("${OPENAIR3_DIR}/UTILS")
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
@@ -581,7 +589,12 @@ include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/radio/COMMON")
+include_directories("${OPENAIR2_DIR}/UTIL/OSA")
+include_directories("${OPENAIR2_DIR}/UTIL/MEM")
+include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
+include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
 include_directories("${OPENAIR2_DIR}/UTIL/MATH")
+include_directories("${OPENAIR2_DIR}/UTIL/TIMER")
 include_directories("${OPENAIR2_DIR}/UTIL/OTG")
 include_directories("${OPENAIR2_DIR}/UTIL/OPT")
 include_directories("${OPENAIR_DIR}")
@@ -609,6 +622,11 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
 )
+if (ENABLE_LTTNG)
+  find_package(LTTngUST 2.3.8 EXACT REQUIRED)
+else()
+  message(STATUS "LTTNG support disabled")
+endif()

 pkg_check_modules(cap libcap)
 if (cap_FOUND)
@@ -923,9 +941,9 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
  ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
-  ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_srs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
  )

  set(PHY_NR_SRC
@@ -1148,7 +1166,6 @@ set(L2_NR_SRC
  ${NR_RRC_DIR}/rrc_gNB.c
  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
  ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
-  ${NR_RRC_DIR}/rrc_gNB_asn1.c
  ${NR_RRC_DIR}/rrc_gNB_nsa.c
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${NR_RRC_DIR}/rrc_gNB_NGAP.c
@@ -1184,6 +1201,7 @@ set(NR_L2_SRC_UE
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
  ${NR_UE_RRC_DIR}/main_ue.c
  ${NR_UE_RRC_DIR}/rrc_UE.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
  ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
  )
@@ -1298,6 +1316,12 @@ add_library(L2
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

+if(E2_AGENT)
+  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+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 nr_ue_ra_procedures)

@@ -1324,6 +1348,10 @@ target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_co
 if(OAI_AERIAL)
    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
+if(E2_AGENT)
+  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()

 add_library(L2_LTE_NR
  # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
@@ -1653,6 +1681,13 @@ include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)

+# nbiot
+add_definitions("-DNUMBER_OF_UE_MAX_NB_IoT=16")
+set (NBIOT_SOURCES
+  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_config.c
+  )
+add_library(NB_IoT MODULE ${NBIOT_SOURCES} )
+
 # Simulation library
 ##########################
 set (SIMUSRC
@@ -1678,8 +1713,9 @@ include_directories("${NFAPI_DIR}/nfapi/inc")
 include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")

-add_library(oai_iqplayer MODULE ${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c)
-target_link_libraries(oai_iqplayer PRIVATE log_headers)
+add_library(oai_iqplayer MODULE
+	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
+	)

 #################################
 # add executables for operation
@@ -1689,6 +1725,10 @@ add_library(minimal_lib
  )
 target_link_libraries(minimal_lib PUBLIC pthread dl ${T_LIB} LOG)

+add_executable(nfapi_test
+  ${OPENAIR_DIR}/openair2/NR_PHY_INTERFACE/nfapi_5g_test.c
+  )
+
 add_executable(measurement_display
  ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)
@@ -1728,7 +1768,6 @@ target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 if(E2_AGENT)
-  target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

@@ -1788,30 +1827,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                      asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)

-# nr RRU
-add_executable(oainr_ru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
-  ${OPENAIR_DIR}/radio/COMMON/record_player.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-  ${OPENAIR_DIR}/executables/nr-oru.c
-)
-target_link_libraries(oainr_ru PRIVATE
-  -Wl,--start-group
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU shlib_loader
-  -Wl,--end-group z dl)
-target_link_libraries(oainr_ru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(oainr_ru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management PHY_NR MAC_NR_COMMON PHY_NR_COMMON)
-
 # nr-softmodem
 ###################################################

@@ -1856,7 +1871,6 @@ if (OAI_AERIAL)
  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
 endif()
 if(E2_AGENT)
-  target_link_libraries(nr-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

@@ -1878,7 +1892,6 @@ target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
                      GTPV1U e1ap f1ap
                      time_management
-                      alg
                      z dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)
@@ -1931,14 +1944,14 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 #####################################

 #special case for dlim TM4, which uses its own version of phy_scope code
-#add_executable(dlsim_tm4
-#  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
-#  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
-#  )
-#target_link_libraries (dlsim_tm4
-#  -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB PHY ITTI -Wl,--end-group
-#  pthread m rt CONFIG_LIB ${T_LIB}
-#  )
+add_executable(dlsim_tm4
+  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
+  )
+target_link_libraries (dlsim_tm4
+  -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB PHY ITTI -Wl,--end-group
+  pthread m rt CONFIG_LIB ${T_LIB}
+  )

 add_executable(rftest
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
@@ -2000,6 +2013,7 @@ target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_psbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2020,6 +2034,7 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2049,6 +2064,7 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2060,9 +2076,7 @@ target_link_libraries(nr_ulsim PRIVATE
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-# these simulators do not compile:
-# dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
-foreach(myExe dlsim ulsim)
+foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

  add_executable(${myExe}
    ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
@@ -2082,23 +2096,22 @@ endforeach(myExe)

 #unitary tests for Core NEtwork pieces
 #################################
-#foreach(myExe
-#    s1ap
-#    secu_knas_encrypt_eia1
-#    secu_kenb
-#    aes128_ctr
-#    secu_knas_encrypt_eea2
-#    secu_knas secu_knas_encrypt_eea1
-#    kdf
-#    aes128_cmac_encrypt
-#    secu_knas_encrypt_eia2)
-#  add_executable(test_${myExe}
-#    ${OPENAIR3_DIR}/TEST/test_${myExe}.c
-#    )
-#  target_link_libraries (test_${myExe}
-#    -Wl,--start-group SECURITY UTIL -Wl,--end-group m rt CONFIG_LIB
-#    )
-#endforeach(myExe)
+foreach(myExe s1ap
+    secu_knas_encrypt_eia1
+    secu_kenb
+    aes128_ctr
+    secu_knas_encrypt_eea2
+    secu_knas secu_knas_encrypt_eea1
+    kdf
+    aes128_cmac_encrypt
+    secu_knas_encrypt_eia2)
+  add_executable(test_${myExe}
+    ${OPENAIR3_DIR}/TEST/test_${myExe}.c
+    )
+  target_link_libraries (test_${myExe}
+    -Wl,--start-group SECURITY UTIL -Wl,--end-group m rt CONFIG_LIB
+    )
+endforeach(myExe)

 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
@@ -2108,17 +2121,17 @@ if (${T_TRACER})
        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
        ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
-        nr_ulschsim ldpctest polartest smallblocktest
+        nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
        #all "add_library" definitions
        ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
-        params_libconfig
-        oai_eth_transpro HASHTABLE UTIL
-        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
+        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
+        oai_eth_transpro oai_mobipass HASHTABLE UTIL OMG_SUMO
+        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
-        GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU
+        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
        dfts config_internals nr_common crc_byte)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
@@ -2126,6 +2139,8 @@ if (${T_TRACER})
  endforeach(i)
 endif (${T_TRACER})

+include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
+
 set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
 set_property(CACHE ENABLE_TESTS PROPERTY TYPE BOOL)
 set(ENABLE_PHYSIM_TESTS OFF CACHE STRING "Activate build of physim tests")
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -35,8 +35,6 @@ def gitCommitAuthorEmailAddr
 // list of failing stages
 def failingStages = ""

-OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
-
 pipeline {
  agent {
    label nodeExecutor
@@ -177,28 +175,6 @@ pipeline {
            }
          }
        }
-        stage ("Ubuntu-Jetson-Image-Builder") {
-          steps {
-            script {
-              triggerSlaveJob ('RAN-Ubuntu-Jetson-Image-Builder', 'Ubuntu-Jetson-Image-Builder')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                ubuntuJetsonBuildStatus = finalizeSlaveJob('RAN-Ubuntu-Jetson-Image-Builder')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += ubuntuJetsonBuildStatus
-              }
-            }
-          }
-        }
        stage ("RHEL-Cluster-Image-Builder") {
          steps {
            script {
@@ -267,24 +243,6 @@ pipeline {
        }
      }
    }
-    stage ("DockerHub-Push") {
-      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
-      steps {
-        script {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
-          }
-        }
-      }
-      post {
-        failure {
-          script {
-            echo "Push to Docker-Hub KO"
-            failingStages += '\n * RAN-DockerHub-Push'
-          }
-        }
-      }
-    }
    stage ("Image Test Processes") {
      when { expression {doBuild} }
      parallel {
@@ -311,29 +269,6 @@ pipeline {
            }
          }
        }
-        stage ("PhySim-GraceHopper-5G") {
-          when { expression {do5Gtest || do5GUeTest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-PhySim-GraceHopper-5G', 'PhySim-GraceHopper-5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                physimGH5GStatus = finalizeSlaveJob('RAN-PhySim-GraceHopper-5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += physimGH5GStatus
-              }
-            }
-          }
-        }
        stage ("PhySim-Cluster-4G") {
          when { expression {do4Gtest} }
          steps {
@@ -726,29 +661,6 @@ pipeline {
            }
          }
        }
-        stage ("SA-Handover-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-Handover-CN5G', 'SA-Handover-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saHandoverStatus = finalizeSlaveJob('RAN-SA-Handover-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saHandoverStatus
-              }
-            }
-          }
-        }
        stage ("SA-OAIUE-CN5G") {
          when { expression {do5Gtest || do5GUeTest} }
          steps {
@@ -774,6 +686,23 @@ pipeline {
        }
      }
    }
+    stage ("DockerHub-Push") {
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
+      steps {
+        script {
+          triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
+        }
+      }
+      post {
+        failure {
+          script {
+            echo "Push to Docker-Hub KO"
+            currentBuild.result = 'FAILURE'
+            failingStages += '\n * RAN-DockerHub-Push'
+          }
+        }
+      }
+    }
  }
  post {
    success {
@@ -837,11 +766,11 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
    shortenShaOne = shortenShaOne.trim()
    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
+    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
  } else {
    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
    shortenShaOne = shortenShaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
+    fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:develop-' + shortenShaOne
  }
  // Workaround for the "cancelled" GitLab pipeline notification
  // The slave job is triggered with the propagate false so the following commands are executed
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -31,9 +31,6 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Docker Hub account to push to
 def DH_Account = "oaisoftwarealliance"

-// internal registry to use
-def OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
-
 pipeline {
  agent {
    label nodeExecutor
@@ -82,22 +79,14 @@ pipeline {
            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
            // Logging in on both registries
            sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
-            sh "docker login -u oaicicd -p oaicicd ${OAI_Registry} > /dev/null 2>&1"
+            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
            listOfImages.eachWithIndex { item, iindex ->
-              if (["oai-gnb", "oai-nr-ue", "oai-nr-cuup"].contains(item)) {
-                // For images built on AMD64 and ARMv8 Jetson
-                echo "Pushing image '${item}' for both AMD64 and ARM64 architectures with tags: ${WEEK_TAG} and develop"
-                sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop || true"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:${WEEK_TAG} ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-              } else {
-                sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
-                sh "docker push --quiet ${DH_Account}/${item}:develop"
-                sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
-              }
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
+              sh "docker pull --quiet porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+              sh "docker image tag porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:develop"
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop porcepix.sboai.cs.eurecom.fr/${item}:develop-${WEEK_SHA}"
            }
            // Proxy is not following the same pattern.
            sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
@@ -106,7 +95,7 @@ pipeline {
            sh "docker push --quiet ${DH_Account}/proxy:${WEEK_TAG}"
            sh "docker rmi ${DH_Account}/proxy:develop ${DH_Account}/proxy:${WEEK_TAG}"
            // Logging out on both registries
-            sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
+            sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
            sh "docker logout > /dev/null 2>&1"
          }
        }
@@ -116,7 +105,7 @@ pipeline {
  post {
    always {
      script {
-        sh "docker logout ${OAI_Registry} > /dev/null 2>&1"
+        sh "docker logout porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
        sh "docker logout > /dev/null 2>&1"
        echo "End of Registry Push"
      }
--- a/ci-scripts/as_ue/config.cfg
+++ b/ci-scripts/as_ue/config.cfg
@@ -44,4 +44,4 @@ rf_driver: {
 #endif

 tx_gain: 75.0, /* TX gain (in dB) */
-rx_gain: 52.0, /* RX gain (in dB) */
+rx_gain: 55.0, /* RX gain (in dB) */
--- a/ci-scripts/attenuatorctl.py
+++ b/ci-scripts/attenuatorctl.py
@@ -1,175 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import logging
-import itertools
-import usb.core
-import usb.util
-import sys
-import time
-
-logging.basicConfig(
-    level=logging.DEBUG,
-    stream=sys.stdout,
-    format="%(message)s"
-)
-
-# helper class parsing command line options for channels and attenuators
-class ValidateChAtt(argparse.Action):
-    def _parse_channels(s):
-        if len(s.split("-")) == 2:
-            s, e = [int(x) for x in s.split("-")]
-            chs = [x for x in range(s, e+1)]
-            if len(chs) == 0:
-                raise Exception(f"empty range")
-        elif len(s.split(",")) > 1:
-            chs = [int(x) for x in s.split(",")]
-        elif s.isdigit():
-            chs = [int(s)]
-        else:
-            raise Exception(f"could not parse channel expression")
-        for c in chs:
-            if not 1 <= c <= 4:
-                raise Exception(f"channel number must be within [1,4], but have {c}")
-        return chs
-
-    def __call__(self, parse, args, values, option_string=None):
-        ch, att = values
-        try:
-            chs = ValidateChAtt._parse_channels(ch)
-        except Exception as e:
-            parse.exit(1, f"while parsing channel expression {ch}: {e}\n")
-        if not att.isdigit():
-            parse.exit(1, f'expected number for attenuation, but got {att}\n')
-        if not 0 <= int(att) <= 63:
-            parse.exit(1, f'attenuation must be within [0,63], but is {att}\n')
-        opts = getattr(args, self.dest) or {}
-        for c in chs:
-            opts[c] = int(att)
-        setattr(args, self.dest, opts)
-
-def _parse_args() -> argparse.Namespace:
-    epilog = '''
-[CHs] can have the following forms:
-  (1) single channel number w (within [1-4])
-  (2) a range of channels in the form x-y (x <= y)
-  (3) a list of channels in the form a,b,c
-[ATT] must be within [0,63] (dB)
-
--set and --reach are mutually exclusive
-
-Examples:
- reset all channels to 0: -s 1-4 0
- set channels 3 and 4 to attenuation 60: -s 3,4 60
- perform attenuation sweep during 10s, reaching ch. 1+2 to 60: -r 1,2 60 -d 10
-'''
-    parser = argparse.ArgumentParser(description='Mini-Circuit RC*DAT attenuator controller',
-                                     epilog=epilog,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
-
-    parser.add_argument('--info', '-i', action='store_true', default=False,
-                        help='Get Infos for all connected Mini-Circuits RC*DAT',)
-    parser.add_argument('--set', '-s', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Set a fixed attenuation ATT on channels CHs")
-    parser.add_argument('--reach', '-r', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Perform an \"attenuation sweep\": reach attenuation ATT on channels CHs")
-    parser.add_argument('--duration', '-d', action='store', type=float, default=5.0,
-                        help='DURATION for attenuation sweep to --reach given attenuation (Default: 5)',)
-    parser.add_argument('--progress', '-p', action='store_true', default=False,
-                        help='If provided, will show progress during attenuation sweep',)
-    return parser.parse_args()
-
-def _exec(dev, cmd):
-    dev.write(1, cmd)
-    ans = dev.read(0x81,64)
-    # take from ans(wer) while valid bytes
-    sn = itertools.takewhile(lambda x: x < 255 and x > 0, ans)
-    # turn bytes into characters and accumulate into string
-    return "".join(map(chr, sn))
-
-def devId(dev):
-    return f"{dev.idVendor:04x}:{dev.idProduct:04x}"
-
-def _info(dev):
-    ident = devId(dev)
-    SerialN = _exec(dev, "*:SN?")
-    ModelN = _exec(dev, "*:MN?")
-    Fw = _exec(dev, "*:FIRMWARE?")
-
-    logging.info(f'{ident}: model is {ModelN}')
-    logging.info(f'{ident}: serial number is {SerialN}')
-    logging.info(f'{ident}: FW version is {Fw}')
-
-def _get_attenuation(dev):
-    ident = devId(dev)
-    att = _exec(dev, "*:ATT?")
-    # remove leading "*" and split by channels
-    return [float(n) for n in att[1:].split(" ")]
-
-def _set_attenuation(dev, ch_att):
-    ident = devId(dev)
-    for ch, att in ch_att:
-        #logging.debug(f"{ident}: Set attenuation channel {ch}: {att} dB")
-        att = round(4 * att) / 4 # round to closest 0.25dB
-        resp = _exec(dev, f"*:CHAN:{ch}:SETATT:{att};" )
-
-def _continuous_set_attenuation(dev, ch_att_end, duration, show_progress=False, step_duration=0.25):
-    ident = devId(dev)
-
-    current = _get_attenuation(dev)
-    steps = duration / step_duration
-    ch_att_step = [(ch, (att_end - current[ch - 1]) / steps) for ch, att_end in ch_att_end]
-    logging.info(f"{ident}: sweep attenuation during {duration} s in {steps} steps: increments {ch_att_step}")
-    for i in range(1, int(steps)+1):
-        next_att = [(ch, current[ch - 1] + i * att_step) for ch, att_step in ch_att_step]
-        _set_attenuation(dev, next_att)
-        if show_progress:
-            logging.debug(f"{ident}: attenuation for channel(s): {next_att}")
-        time.sleep(step_duration)
-    _set_attenuation(dev, ch_att_end)
-
-def _get_usb_devs(idVendor, idProduct):
-    devs = []
-    for dev in usb.core.find(idVendor=idVendor, idProduct=idProduct, find_all=True):
-        for configuration in dev:
-            for interface in configuration:
-                ifnum = interface.bInterfaceNumber
-                if not dev.is_kernel_driver_active(ifnum):
-                    continue
-                try:
-                    dev.detach_kernel_driver(ifnum)
-                except e:
-                    pass
-        devs.append(dev)
-    return devs
-
-if __name__ == '__main__':
-    # Parse the arguments
-    args = _parse_args()
-    if args.set and args.reach:
-        logging.error("--set and --reach are mutually exclusive")
-        sys.exit(1)
-
-    # 20ce:0023 is Mini-Circuit RC*DAT device
-    devs = _get_usb_devs(idVendor=0x20ce, idProduct=0x0023)
-    if len(devs) == 0:
-        logging.error('no Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    if len(devs) > 1:
-        logging.error('more than one Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    dev = devs[0]
-
-    if args.info:
-        _info(dev)
-
-    if args.set:
-        _set_attenuation(dev, [(k,v) for k,v in args.set.items()])
-
-    if args.reach:
-        _continuous_set_attenuation(dev, [(k,v) for k,v in args.reach.items()], args.duration, args.progress)
-
-    ident = devId(dev)
-    for i, a in enumerate(_get_attenuation(dev)):
-        logging.info(f"{ident}: Attenuation channel {i+1}: {a} dB")
-    sys.exit(0)
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -12,14 +12,6 @@ idefix:
  IF: wwan0
  MTU: 1500

-raspix:
-  Host: raspix
-  AttachScript: sudo /opt/mbim_scripts/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim_scripts/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
 up2:
  Host: up2
  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
@@ -85,14 +77,6 @@ oc-cn5g-20897:
  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"

-oc-cn5g-00103-ho:
-  Host: groot
-  NetworkScript: echo "inet 172.21.6.111"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ho %%log_dir%%"
-
 oc-cn5g-20897-aerial:
  Host: gracehopper1-oai
  NetworkScript: echo "inet 172.21.6.105"
@@ -471,93 +455,3 @@ l2sim4g_ext_dn:
  Host: "%%current_host%%"
  NetworkScript: docker exec l2sim4g-trf-gen ip a show dev eth0
  CmdPrefix: docker exec l2sim4g-trf-gen
-
-rfsim5g_multiue1:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue1
-  AttachScript: docker start rfsim5g-oai-nr-ue
-  DetachScript: docker stop rfsim5g-oai-nr-ue
-  MTU: 1500
-
-rfsim5g_multiue2:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue2
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue2
-  AttachScript: true
-  DetachScript: true
-  MTU: 1500
-
-rfsim5g_multiue3:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue3
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue3
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue4:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue4
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue4
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue5:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue5
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue5
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue6:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue6
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue6
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue7:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue7
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue7
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue8:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue8
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue8
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue9:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue9
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue9
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
-
-rfsim5g_multiue10:
-  Host: "%%current_host%%"
-  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue10
-  CmdPrefix: docker exec rfsim5g-oai-nr-ue
-  IF: oaitun_ue10
-  AttachScript: "true"
-  DetachScript: "true"
-  MTU: 1500
--- a/ci-scripts/cls_analysis.py
+++ b/ci-scripts/cls_analysis.py
@@ -26,26 +26,65 @@ import os
 import xml.etree.ElementTree as ET
 import json

+# 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 _get_test_description(properties):
-		env_vars = None
-		for p in properties:
-			if p["name"] == "ENVIRONMENT":
-				env_vars = p["value"] # save for later if no custom property
-			if p["name"] == "TEST_DESCRIPTION":
-				return p["value"]
-		# if we came till here, it means there is no custom test property
-		# saved in JSON.  See if we have a description in environment variables
-		if not env_vars:
-			return "<none>"
-		for ev in env_vars:
-			name, value = ev.split("=", 1)
-			if name == "TEST_DESCRIPTION":
-				return value
-		return "<none>"
+	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 = ''

-	def analyze_physim(result_junit, details_json, logPath):
+		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
+
+	def analyze_oc_physim(result_junit, details_json, logPath):
 		try:
 			tree = ET.parse(result_junit)
 			root = tree.getroot()
@@ -77,7 +116,7 @@ class Analysis():
 		for test in root: # for each test
 			test_name = test.attrib["name"]
 			test_exec = json_test_desc[test_name]["properties"][1]["value"][0]
-			desc = Analysis._get_test_description(json_test_desc[test_name]["properties"])
+			desc = json_test_desc[test_name]["properties"][1]["value"][1]
 			# get runtime and checks
 			test_check = test.attrib["status"] == "run"
 			time = round(float(test.attrib["time"]), 1)
@@ -90,16 +129,13 @@ class Analysis():
 			with open(f'{log_dir}/{test_name}.log', 'w') as f:
 				f.write(output)
 			# prepare result and info
+			info = f"Runtime: {f'{time:.3f}'[:5]} s"
 			resultstr = 'PASS' if (test_check and time_check and output_check) else 'FAIL'
-			info = f"{test_name}.log: test {resultstr}"
-			for l in output.splitlines():
-				if l.startswith("CHECK "):
-					info += f"\n{l}"
 			if test_check:
 				if not output_check:
-					info += "\nTest log exceeds maximal allowed length 100 kB"
+					info += " Test log exceeds maximal allowed length 100 kB"
 				if not time_check:
-					info += "\nTest exceeds 150s"
+					info += " Test exceeds 150s"
 				if not (time_check and output_check):
 					nb_failed += 1 # time threshold/output length error, not counted for by ctest as of now
 			test_result[test_name] = [desc, info, resultstr]
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -34,6 +34,7 @@ import time
 import os

 import cls_oai_html
+import cls_analysis
 import constants as CONST
 import helpreadme as HELP
 import cls_containerize
@@ -416,3 +417,34 @@ class Cluster:
 			c.run(f'cp -r {ctx.logPath} {os.getcwd()}/test_log_{ctx.test_id}/')

 		return status
+
+	def deploy_oc_physim(self, ctx, HTML, oc_release, node):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {self.ranBranch} ranCommitID {self.ranCommitID}')
+		image_tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+		logging.debug(f'Running physims from server: {node}')
+		script = "scripts/oc-deploy-physims.sh"
+		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {self.eNBSourceCodePath}"
+		ret = cls_cmd.runScript(node, script, 600, options)
+		logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+		with cls_cmd.getConnection(node) as ssh:
+			details_json = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-tests.json')
+			result_junit = archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/{oc_release}-run.xml')
+			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_log.txt')
+			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/physim_pods_summary.txt')
+			archiveArtifact(ssh, ctx, f'{self.eNBSourceCodePath}/ci-scripts/LastTestsFailed.log')
+		test_status, test_summary, test_result = cls_analysis.Analysis.analyze_oc_physim(result_junit, details_json, ctx.logPath)
+		if test_summary:
+			if test_status:
+				HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+				logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
+			else:
+				HTML.CreateHtmlTestRowQueue('At least one physical simulator test failed!', 'KO', ["See below for details"])
+				HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
+				logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+		else:
+			HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
+			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
+		return test_status
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -45,6 +45,12 @@ def getConnection(host, d=None):
 	else:
 		return RemoteCmd(host, d=d)

+def runScript(host, path, timeout, parameters=None, redirect=None, silent=False):
+	if is_local(host):
+		return LocalCmd.exec_script(path, timeout, parameters, redirect, silent)
+	else:
+		return RemoteCmd.exec_script(host, path, timeout, parameters, redirect, silent)
+
 # provides a partial interface for the legacy SSHconnection class (getBefore(), command())
 class Cmd(metaclass=abc.ABCMeta):
 	def cd(self, d, silent=False):
@@ -105,12 +111,12 @@ class LocalCmd(Cmd):
 			logging.debug(f'Working dir is {self.cwd}')
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')

-	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
+	def exec_script(path, timeout, parameters=None, redirect=None, silent=False):
 		if redirect and not redirect.startswith("/"):
 			raise ValueError(f"redirect must be absolute, but is {redirect}")
 		c = f"{path} {parameters}" if parameters else path
 		if not redirect:
-			ret = sp.run(c, shell=True, cwd=self.cwd, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
+			ret = sp.run(c, shell=True, timeout=timeout, stdout=sp.PIPE, stderr=sp.STDOUT)
 			ret.stdout = ret.stdout.decode('utf-8').strip()
 		else:
 			with open(redirect, "w") as f:
@@ -232,15 +238,18 @@ class RemoteCmd(Cmd):
 			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
 		return cfg

-	def exec_script(self, path, timeout, parameters=None, redirect=None, silent=False):
+	def exec_script(host, path, timeout, parameters=None, redirect=None, silent=False):
 		if redirect and not redirect.startswith("/"):
 			raise ValueError(f"redirect must be absolute, but is {redirect}")
 		p = parameters if parameters else ""
 		r = f"> {redirect}" if redirect else ""
 		if not silent:
-			logging.debug(f"local> ssh {self.hostname} bash -s {p} < {path} {r}")
+			logging.debug(f"local> ssh {host} bash -s {p} < {path} {r} # {path} from localhost")
+		client = RemoteCmd._ssh_init()
+		cfg = RemoteCmd._lookup_ssh_config(host)
+		client.connect(**cfg)
 		bash_opt = 'BASH_XTRACEFD=1' # write bash set -x output to stdout, see bash(1)
-		stdin, stdout, stderr = self.client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
+		stdin, stdout, stderr = client.exec_command(f"{bash_opt} bash -s {p} {r}", timeout=timeout)
 		# open() the file f at path, read() it and write() it into the stdin of the bash -s cmd
 		with open(path) as f:
 			stdin.write(f.read())
@@ -250,6 +259,7 @@ class RemoteCmd(Cmd):
 		if redirect: cmd += f" &> {redirect}"
 		ret = sp.CompletedProcess(args=cmd, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
 		ret.stdout = ret.stdout.decode('utf-8').strip()
+		client.close()
 		return ret

 	def run(self, line, timeout=300, silent=False, reportNonZero=True):
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -53,7 +53,6 @@ from cls_ci_helper import archiveArtifact
 # (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-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
-DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"

 def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -67,8 +66,7 @@ def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranc
 			ranTargetBranch = 'develop'
 		options += f" {ranTargetBranch}"
 	logging.info(f'execute "{script}" with options "{options}" on node {host}')
-	with cls_cmd.getConnection(host) as c:
-		ret = c.exec_script(script, 90, options)
+	ret = cls_cmd.runScript(host, script, 90, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	return ret.returncode == 0

@@ -119,7 +117,7 @@ def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):

 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
+	registry = "oai-ci" # pull_images() gives us this registry path
 	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
@@ -134,8 +132,7 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		# or -asan images. We need to detect which kind we did pull.
 		fullImageName = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
 		image = fullImageName.split("/")[-1].split(":")[0]
-		# registry now includes the trailing slash ("oai-ci/")
-		checkimg = f"{registry}{image}-asan:{tag}"
+		checkimg = f"{registry}/{image}-asan:{tag}"
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
@@ -306,18 +303,13 @@ class Containerize():
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu.cross-arm64'
-		result = re.search('native_armv9', self.imageKind)
+		result = re.search('native_arm', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
 			imageNames.append(('ran-build-fhi72', 'build.fhi72.native_arm', 'ran-build-fhi72', ''))
 			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
 			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
-		result = re.search('native_armv8', self.imageKind)
-		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
-			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 		
 		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
@@ -370,6 +362,7 @@ class Containerize():
 			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
 			return False
 		else:
 			result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
@@ -396,13 +389,13 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.10.09.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc.src.2025.05.20.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
+				cmd.run('rm -f nvipc.src.2025.05.20.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -493,6 +486,7 @@ class Containerize():
 				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
 				ssh.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+				HTML.CreateHtmlTabFooter(False)
 				return False
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
@@ -561,6 +555,7 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
 			return False

 		# build ran-unittests image
@@ -571,6 +566,7 @@ class Containerize():
 		if ret.returncode != 0:
 			logging.error(f'Cannot build unit tests')
 			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
+			HTML.CreateHtmlTabFooter(False)
 			return False

 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
@@ -589,16 +585,18 @@ class Containerize():

 		if ret.returncode == 0:
 			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
+			HTML.CreateHtmlTabFooter(True)
 			return True
 		else:
 			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
+			HTML.CreateHtmlTabFooter(False)
 			return False

 	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
 		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Pushing images to server: ' + node)
 		ssh = cls_cmd.getConnection(node)
-		imagePrefix = DEFAULT_REGISTRY
+		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
 		if ret.returncode != 0:
 			msg = 'Could not log into local registry'
@@ -669,7 +667,7 @@ class Containerize():
 		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
 		return True, msg

-	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry=DEFAULT_REGISTRY, username="oaicicd", password="oaicicd"):
+	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
 		logging.debug(f'\u001B[1m Pulling image(s) on server: {node}\u001B[0m')
 		if not tag:
 			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
--- a/ci-scripts/cls_corenetwork.py
+++ b/ci-scripts/cls_corenetwork.py
@@ -77,8 +77,7 @@ class CoreNetwork:
 		words = line[1:].strip().split(" ")
 		script_name = words[0]
 		options = " ".join(words[1:])
-		with cls_cmd.getConnection(host) as c:
-			ret = c.exec_script(script_name, 300, parameters=options, silent=silent)
+		ret = cls_cmd.runScript(host, script_name, 300, parameters=options, silent=silent)
 		return ret

 	def _command(self, cmd_list, must_succeed=False, silent=False):
--- a/ci-scripts/cls_native.py
+++ b/ci-scripts/cls_native.py
@@ -64,3 +64,18 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
+
+	def Run_Physim(ctx, HTML, host, directory, options, physim_test, threshold):
+		logging.debug(f'Runnin {physim_test} on server: {host}')
+		workSpacePath = f'{directory}/cmake_targets'
+		runLogFile=f'{workSpacePath}/physim.log'
+		with cls_cmd.getConnection(host) as cmd:
+			cmd.run(f'sudo LD_LIBRARY_PATH=.:{DPDK_PATH}/lib64/ {workSpacePath}/ran_build/build/{physim_test} {options} > {runLogFile} 2>&1')
+			physim_file = archiveArtifact(cmd, ctx, runLogFile)
+		success, msg = cls_analysis.Analysis.analyze_physim(physim_file, 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
@@ -247,7 +247,7 @@ class HTMLManagement():
 			self.htmlFile.write('      </tr>\n')
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  <p></p>\n')
-			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2025 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
+			self.htmlFile.write('  <div class="well well-lg">End of Test Report -- Copyright <span class="glyphicon glyphicon-copyright-mark"></span> 2018 <a href="http://www.openairinterface.org/">OpenAirInterface</a>. All Rights Reserved.</div>\n')
 			self.htmlFile.write('</div></body>\n')
 			self.htmlFile.write('</html>\n')
 			self.htmlFile.close()
@@ -533,6 +533,6 @@ class HTMLManagement():
 					self.htmlFile.write('        <td bgcolor = "green" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
 				else:
 					self.htmlFile.write('        <td bgcolor = "red" ><font color="white"><b>' + value[2]  + '</b></font></td>\n')
-				self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan"><pre style="display: inline flow-root list-item; margin: 0 3px 0 3px; min-width: 24em;">{value[1]}</pre></td>\n')
+				self.htmlFile.write('        <td bgcolor = "lightcyan">' + value[1] + '</td>\n')

 		self.htmlFile.close()
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -46,7 +46,6 @@ import constants as CONST

 import cls_module
 import cls_corenetwork
-import cls_analysis
 import cls_cmd
 from cls_ci_helper import archiveArtifact

@@ -235,8 +234,7 @@ def Custom_Command(HTML, node, command):

 def Custom_Script(HTML, node, script):
 	logging.info(f"Executing custom script on {node}")
-	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90)
+	ret = cls_cmd.runScript(node, script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -251,34 +249,6 @@ def IdleSleep(HTML, idle_sleep_time):
 	HTML.CreateHtmlTestRow(f"{idle_sleep_time} sec", 'OK', CONST.ALL_PROCESSES_OK)
 	return True

-def Deploy_Physim(ctx, HTML, node, workdir, script, options):
-	logging.debug(f'Running physims on server {node} workdir {workdir}')
-	with cls_cmd.getConnection(node) as c:
-		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1000, options)
-	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
-	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
-	with cls_cmd.getConnection(node) as ssh:
-		details_json = archiveArtifact(ssh, ctx, f'{workdir}/desc-tests.json')
-		result_junit = archiveArtifact(ssh, ctx, f'{workdir}/results-run.xml')
-		archiveArtifact(ssh, ctx, f'{workdir}/physim_log.txt')
-		archiveArtifact(ssh, ctx, f'{workdir}/LastTestsFailed.log')
-		archiveArtifact(ssh, ctx, f'{workdir}/LastTest.log')
-	test_status, test_summary, test_result = cls_analysis.Analysis.analyze_physim(result_junit, details_json, ctx.logPath)
-	if test_summary:
-		if test_status:
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-			logging.info('\u001B[1m Physical Simulator Pass\u001B[0m')
-		else:
-			HTML.CreateHtmlTestRowQueue('At least one physical simulator test failed!', 'KO', ["See below for details"])
-			HTML.CreateHtmlTestRowPhySimTestResult(test_summary, test_result)
-			logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-	else:
-		HTML.CreateHtmlTestRowQueue('Physical simulator failed', 'KO', [test_result])
-		logging.error('\u001B[1m Physical Simulator Fail\u001B[0m')
-	return test_status
-
 #-----------------------------------------------------------
 # OaiCiTest Class Definition
 #-----------------------------------------------------------
@@ -503,11 +473,6 @@ class OaiCiTest():
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
-				# Clean up any existing iperf3 server processes on this port.
-				ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
-				# If pkill succeeds, it means there was a leftover iperf3 server.
-				if ret.returncode == 0:
-					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
 			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -15,7 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-    @include "neighbour-config.conf"
+

    nr_cellid = 12345678L;

--- a/ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf
@@ -1,76 +0,0 @@
-Active_gNBs = ( "CU-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe88;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "CU-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code =  1;
-    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1 }) });
-
-    @include "neighbour-config-ho.conf"
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference  = "f1";
-
-    local_s_address  = "172.21.19.98";
-    remote_s_address = "0.0.0.0";
-    local_s_portd    = 2153;
-    remote_s_portd   = 2154;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.109"; });
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.19.98/22";
-        GNB_IPV4_ADDRESS_FOR_NGU    = "172.21.19.98/22";
-        GNB_PORT_FOR_S1U            = 2152; # Spec 2152
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  f1ap_log_level   ="info";
-  ngap_log_level   ="info";
-};
--- a/ci-scripts/conf_files/gnb-cucp.sa.e1-ho-n2.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.e1-ho-n2.conf
@@ -1,82 +0,0 @@
-Active_gNBs = ( "cu-cp-0");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-#     cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "cu-cp-0";
-
-    // 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 }) });
-    @include "neighbour-config.conf"
-
-    nr_cellid = 12345678L;
-
-    tr_s_preference = "f1";
-
-    local_s_address = "192.168.71.150";
-    remote_s_address = "192.168.71.171";
-    local_s_portd   = 2153;
-    remote_s_portd  = 2153;
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
-
-    E1_INTERFACE =
-    (
-      {
-        type = "cp";
-        ipv4_cucp = "192.168.71.150";
-        port_cucp = 38462;
-        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
-        port_cuup = 38462;
-      }
-    )
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
-    };
-  }
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-  pdcp_log_level = "info";
-  rrc_log_level = "info";
-  f1ap_log_level = "info";
-  ngap_log_level = "info";
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -23,6 +23,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime = 2;
+    do_CSIRS     = 1;
    do_SRS       = 1;

    servingCellConfigCommon = (
@@ -134,19 +135,29 @@ gNBs =
      # pattern1 
      # dl_UL_TransmissionPeriodicity
      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;

      ssPBCH_BlockPower                                             = -25;
     }

  );

-    first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;});
+    servingCellConfigDedicated = ({
+      dl_bwp-Id_1 = 1;
+      dl_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
+      dl_bwp1_subcarrierSpacing = 1;
+      firstActiveDownlinkBWP-Id = 1;
+      defaultDownlinkBWP-Id = 1;
+      ul_bwp-Id_1 = 1;
+      ul_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
+      ul_bwp1_subcarrierSpacing = 1;
+      firstActiveUplinkBWP-Id = 1;
+    });
+

    # ------- SCTP definitions
    SCTP :
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
@@ -1,210 +0,0 @@
-Active_gNBs = ( "DU0-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    = 0xe88;
-    gNB_DU_ID = 0xe00;
-    gNB_name  = "DU0-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  = 1 ;
-    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # 4186.56 MHz
-      absoluteFrequencySSB                                          = 679104;
-      dl_frequencyBand                                              = 77;
-      # 4175.82 MHz
-      dl_absoluteFrequencyPointA                                    = 678388;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_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;
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                = 1;
-  tr_s_preference       = "local_L1";
-  tr_n_preference       = "f1";
-  local_n_address       = "172.21.19.98";
-  remote_n_address      = "172.21.19.98";
-  local_n_portd         = 2154;
-  remote_n_portd        = 2153;
-  pusch_TargetSNRx10    = 200;
-  pucch_TargetSNRx10    = 230;
-#  ul_prbblack_SNR_threshold  = 10;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 100;
-  pucch0_dtx_threshold  = 10;
-  max_ldpc_iterations   = 20;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf         = "yes"
-  nb_tx            = 1
-  nb_rx            = 1
-  att_tx           = 0;
-  att_rx           = 0;
-  sl_ahead         = 3;
-  bands            = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain       = 114;
-  eNB_instances    = [0];
-# USRP is connected to an Octoclock in order to establish synchroniation with other USRPs
-  clock_src        = "external";
-  time_src         = "external";
-}
-);
-
-log_config :
-{
-  global_log_level ="info";
-  hw_log_level     ="info";
-  phy_log_level    ="info";
-  mac_log_level    ="info";
-  rlc_log_level    ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  ngap_log_level   ="debug";
-  f1ap_log_level   ="info";
-};
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
@@ -1,210 +0,0 @@
-Active_gNBs = ( "DU1-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    = 0xe88;
-    gNB_DU_ID = 0xe01;
-    gNB_name  = "DU1-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  = 1 ;
-    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 11111111L;
-
-    ////////// Physical parameters:
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 1;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # 4186.56 MHz
-      absoluteFrequencySSB                                          = 679104;
-      dl_frequencyBand                                              = 77;
-      # 4175.82 MHz
-      dl_absoluteFrequencyPointA                                    = 678388;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                            = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 2;
-
-# 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;
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                = 1;
-  tr_s_preference       = "local_L1";
-  tr_n_preference       = "f1";
-  local_n_address       = "172.21.19.99";
-  remote_n_address      = "172.21.19.98";
-  local_n_portd         = 2154;
-  remote_n_portd        = 2153;
-  pusch_TargetSNRx10    = 200;
-  pucch_TargetSNRx10    = 230;
-#  ul_prbblack_SNR_threshold  = 10;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 100;
-  pucch0_dtx_threshold  = 10;
-  max_ldpc_iterations   = 20;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf         = "yes"
-  nb_tx            = 1
-  nb_rx            = 1
-  att_tx           = 0;
-  att_rx           = 0;
-  sl_ahead         = 3;
-  bands            = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain       = 114;
-  eNB_instances    = [0];
-# USRP is connected to an Octoclock in order to establish synchroniation with other USRPs
-  clock_src        = "external";
-  time_src         = "external";
-}
-);
-
-log_config :
-{
-  global_log_level ="info";
-  hw_log_level     ="info";
-  phy_log_level    ="info";
-  mac_log_level    ="info";
-  rlc_log_level    ="info";
-  pdcp_log_level   ="info";
-  rrc_log_level    ="info";
-  ngap_log_level   ="debug";
-  f1ap_log_level   ="info";
-};
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -197,6 +197,7 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200; # 150;
  pucch_TargetSNRx10          = 200; #200;
+  ulsch_max_frame_inactivity  = 10;
  dl_max_mcs = 28;
  ul_max_mcs = 28;
 }
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
@@ -1,227 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-nfapi = "AERIAL";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }); });
-
-    nr_cellid = 12345678L;
-    uess_agg_levels = [0,6,0,0,0];
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-    do_SRS                = 0;
-    min_rxtxtime          = 2;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 98
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         = -90;
-
-# pucch-ConfigCommon 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                                 = 5;
-      nrofDownlinkSlots                                             = 1;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 3;
-      nrofUplinkSymbols                                             = 0;
-
-      ssPBCH_BlockPower                                             = -10;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc           = 1;
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.2"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-  tr_s_preference             = "aerial";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 220; # 150;
-  pucch_TargetSNRx10          = 200; #200;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
-  ul_min_mcs = 16;
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
@@ -198,6 +198,7 @@ MACRLCs = (
  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
+#  ulsch_max_frame_inactivity  = 0;
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
  dl_max_mcs                  = 9;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -16,7 +16,6 @@ gNBs =

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

-    CSI_report_type = "ssb_sinr";
    min_rxtxtime                                              = 6;
    disable_harq                                              = 1;
    cu_sibs = [2];
@@ -206,6 +205,7 @@ MACRLCs = (
  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
+#  ulsch_max_frame_inactivity  = 0;
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
  dl_max_mcs                  = 9;
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -24,7 +24,6 @@ gNBs =
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
    do_SRS                = 1;
-    uess_agg_levels = [4,2,0,0,0];

    servingCellConfigCommon = (
    {
@@ -140,9 +139,9 @@ gNBs =
      # dl_UL_TransmissionPeriodicity
      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 1;
+      nrofDownlinkSlots                                             = 2;
      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 3;
+      nrofUplinkSlots                                               = 2;
      nrofUplinkSymbols                                             = 4;

  ssPBCH_BlockPower                                             = -20;
@@ -179,12 +178,11 @@ MACRLCs = (
  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 320;
-  pucch_TargetSNRx10          = 320;
+  pusch_TargetSNRx10          = 300;
+  pucch_TargetSNRx10          = 300;
+  ulsch_max_frame_inactivity  = 0;
  pusch_FailureThres          = 100;
-  ul_max_mcs                  = 28;
-  ul_bler_target_upper        = 0.20;
-  ul_bler_target_lower        = 0.10;
+  ul_max_mcs		      = 28;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
@@ -106,7 +106,8 @@ gNBs =
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
      ssb_PositionsInBurst_Bitmap                                   = 1;
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
@@ -192,6 +193,8 @@ RUs = (
  eNB_instances  = [0];
  ru_thread_core = 6;
  sl_ahead       = 10; #5;
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
  do_precoding = 0; # needs to match O-RU configuration
 }
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -175,6 +175,7 @@ MACRLCs = (
  pusch_TargetSNRx10          = 270;
  pucch_TargetSNRx10          = 270;
  pusch_FailureThres          = 1000;
+  ulsch_max_frame_inactivity  = 0;
  ul_max_mcs                  = 25;
 }
 );
--- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
@@ -1,237 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-    // Include neighbour configuration for N2 handover
-    @include "neighbour-config-ho.conf"
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3610.56 MHz
-      absoluteFrequencySSB                                             = 679104;
-      dl_frequencyBand                                                 = 77;
-      # this is 3599.94 MHz
-      dl_absoluteFrequencyPointA                                       = 678388;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_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 = "172.21.6.109"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.19.98";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.19.98";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  ul_prbblack_SNR_threshold   = 10;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  clock_src = "external";
-  time_src = "external";
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
-
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -112,7 +112,7 @@ gNBs =
 # 0 = neither, 1= group hopping, 2=sequence hopping
        pucchGroupHopping                                            = 0;
        hoppingId                                                    = 40;
-        p0_nominal                                                   = -80;
+        p0_nominal                                                   = -70;

      ssb_PositionsInBurst_Bitmap                                    = 1;

@@ -175,7 +175,7 @@ MACRLCs = (
  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
-  pusch_TargetSNRx10 = 150;
+  pusch_TargetSNRx10 = 180;
  pucch_TargetSNRx10 = 200;
 }
 );
@@ -184,7 +184,7 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 150;
+  prach_dtx_threshold = 120;
  #pucch0_dtx_threshold = 150;
 }
 );
@@ -198,7 +198,7 @@ RUs = (
  att_rx         = 0;
  bands          = [78];
  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 70;
+  max_rxgain                    = 65;
  eNB_instances  = [0];
  sf_extension = 0
  sdr_addrs = "addr=192.168.80.52,clock_source=internal,time_source=internal"
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -18,6 +18,8 @@ gNBs =

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

+    do_CSIRS                                                  = 0;
+    do_SRS                                                    = 0;
    min_rxtxtime = 6;

    servingCellConfigCommon = (
@@ -143,10 +145,64 @@ gNBs =

    );

-    first_active_bwp = 1;
-    bwp_list = ({ scs = 1; bwpStart = 0; bwpSize = 106;},
-                { scs = 1; bwpStart = 0; bwpSize = 51;},
-                { scs = 1; bwpStart = 0; bwpSize = 24;});
+    # Dedicated Serving Cell Configuration
+    servingCellConfigDedicated = ({
+    # BWP-Downlink
+      # BWP 1 Configuration
+        dl_bwp-Id_1 = 1;
+        dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_bwp1_subcarrierSpacing = 1;
+
+      # BWP 2 Configuration
+        dl_bwp-Id_2 = 2;
+        dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_bwp2_subcarrierSpacing = 1;
+
+      # BWP 3 Configuration
+        dl_bwp-Id_3 = 3;
+        dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
+        # subcarrierSpacing
+        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_bwp3_subcarrierSpacing = 1;
+
+      firstActiveDownlinkBWP-Id = 1;  #BWP-Id
+      defaultDownlinkBWP-Id     = 1;  #BWP-Id
+
+      # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
+      #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
+      #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
+      #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
+
+    # UplinkConfig
+      # BWP-Uplink
+        # BWP 1 Configuration
+          ul_bwp-Id_1 = 1;
+          ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
+          # subcarrierSpacing
+          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+          ul_bwp1_subcarrierSpacing = 1;
+
+        # BWP 2 Configuration
+          ul_bwp-Id_2 = 2;
+          ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
+          # subcarrierSpacing
+          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+          ul_bwp2_subcarrierSpacing = 1;
+
+        # BWP 3 Configuration
+          ul_bwp-Id_3 = 3;
+          ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
+          # subcarrierSpacing
+          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+          ul_bwp3_subcarrierSpacing = 1;
+
+        firstActiveUplinkBWP-Id = 1;  #BWP-Id
+      }
+    );


    # ------- SCTP definitions
@@ -177,6 +233,7 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 250;
  pucch_TargetSNRx10          = 200;
+  ulsch_max_frame_inactivity  = 0;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -146,7 +146,6 @@ MACRLCs:
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200
-    stats_max_ue: 17

 L1s:
  - num_cc: 1
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -196,7 +196,6 @@ RUs = (
  att_tx         = 0
  att_rx         = 0;
  bands          = [78];
-  sl_ahead=3;
  max_pdschReferenceSignalPower = -27;
  max_rxgain                    = 114;
  sf_extension                  = 0;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -21,6 +21,10 @@ gNBs =
    nr_cellid = 12345678L

    ////////// Physical parameters:
+    pdsch_AntennaPorts_XP                                     = 1;
+    pusch_AntennaPorts                                        = 1;
+    do_CSIRS                                                  = 1;
+    do_SRS                                                    = 0;
    uess_agg_levels = [2, 2, 2, 0, 0];

    servingCellConfigCommon = (
@@ -182,7 +186,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
-    stats_max_ue = 17;
  }
 );

--- a/ci-scripts/conf_files/neighbour-config-ho.conf
+++ b/ci-scripts/conf_files/neighbour-config-ho.conf
@@ -1,54 +0,0 @@
-neighbour_list = (
-  {
-    nr_cellid = 12345678;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe01;
-        nr_cellid = 11111111;
-        physical_cellId = 1;
-        absoluteFrequencySSB = 679104;
-        subcarrierSpacing = 1; #30 KHz
-        band = 77;
-        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  },
-  {
-    nr_cellid = 11111111;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe00;
-        nr_cellid = 12345678;
-        physical_cellId = 0;
-        absoluteFrequencySSB = 679104;
-        subcarrierSpacing = 1; #30 KHz
-        band = 77;
-        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  }
- );
-
-
-nr_measurement_configuration = {
-  Periodical = {
-    enable = 1;
-    includeBeamMeasurements = 1;
-    maxNrofRS_IndexesToReport = 4;
-  };
-
-  A2 = {
-    enable = 1;
-    threshold = 110;
-    timeToTrigger = 1;
-  };
-
-  A3 = ({
-    cell_id = -1; #Default
-    offset = 10;
-    hysteresis = 0;
-    timeToTrigger = 1
-  })
-};
--- a/ci-scripts/conf_files/neighbour-config.conf
+++ b/ci-scripts/conf_files/neighbour-config.conf
@@ -1,51 +1,52 @@
-############################################################
-#  gNB-to-gNB neighbour list + measurement configuration   #
-#  for the 2-cell rfsim setup (gNB_ID 0xe00 & 0xb00)       #
-############################################################
-
 neighbour_list = (
-  ##########################################################
-  #      Entry USED BY gNB_ID = 0xe00  (nr_cellid = 1)     #
-  ##########################################################
  {
-    nr_cellid = 0; #  Serving cell of gNB 0xe00
+    nr_cellid = 1;
    neighbour_cell_configuration = (
      {
-        gNB_ID              = 0xb00;
-        nr_cellid           = 1; # Cell served by gNB 0xb00
-        physical_cellId     = 1;
-        absoluteFrequencySSB= 621312;
-        subcarrierSpacing   = 1;  # 30 kHz
-        band                = 78;
-        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
-        tracking_area_code  = 1;
+        gNB_ID = 0xb00;
+        nr_cellid = 2;
+        physical_cellId = 0x002;
+        absoluteFrequencySSB = 641280 ;
+        subcarrierSpacing = 1; #30 KHz
+        plmn = { mcc = 216; mnc = 03; mnc_length = 2};
+        tracking_area_code = 2;
+      },
+      {
+        gNB_ID = 0xa00;
+        nr_cellid = 3;
+        physical_cellId = 0x003;
+        absoluteFrequencySSB = 641280 ;
+        subcarrierSpacing = 1; #30 KHz
+        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
+        tracking_area_code = 3;
+      },
+      {
+        gNB_ID = 0xc00;
+        nr_cellid = 4;
+        physical_cellId = 0x004;
+        absoluteFrequencySSB = 641280 ;
+        subcarrierSpacing = 1; #30 KHz
+        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
+        tracking_area_code = 4;
      }
-    );
+  )
  },
-
-  ##########################################################
-  #      Entry USED BY gNB_ID = 0xb00  (nr_cellid = 2)     #
-  ##########################################################
  {
-    nr_cellid = 1; #  Serving cell of gNB 0xb00
+    nr_cellid = 2;
    neighbour_cell_configuration = (
      {
-        gNB_ID              = 0xe00;
-        nr_cellid           = 0;  # Cell served by gNB 0xe00
-        physical_cellId     = 0;
-        absoluteFrequencySSB= 641280;
-        subcarrierSpacing   = 1;  # 30 kHz
-        band                = 78;
-        plmn                = { mcc = 208; mnc = 99; mnc_length = 2 };
-        tracking_area_code  = 1;
+        gNB_ID = 0xe00;
+        nr_cellid = 1;
+        physical_cellId = 0x000;
+        absoluteFrequencySSB = 641280 ;
+        subcarrierSpacing = 1; #30 KHz
+        plmn = { mcc = 001; mnc = 01; mnc_length = 2};
+        tracking_area_code = 1;
      }
-    );
+    )
  }
-);
+ );

-############################################################
-#        Common NR measurement-event configuration         #
-############################################################

 nr_measurement_configuration = {
  Periodical = {
--- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
@@ -14,6 +14,7 @@ key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
 dnn= "oai";
 nssai_sst=1;
+nssai_sd=16777215;
 }

 MACRLCs = (
--- a/ci-scripts/conf_files/ue.sa.conf
+++ b/ci-scripts/conf_files/ue.sa.conf
@@ -4,6 +4,7 @@ uicc0 = {
  opc= "c42449363bbad02b66d16bc975d77cc1";
  dnn= "oai";
  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/benetel-5g.conf
+++ b/ci-scripts/conf_files/untested/benetel-5g.conf
@@ -86,7 +86,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#oneHalf (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -100,8 +100,8 @@ gNBs =
        powerRampingStep                                            = 1;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_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
--- 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
@@ -96,8 +96,8 @@ gNBs =
        powerRampingStep                                            = 1;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_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
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -105,8 +105,8 @@ gNBs =
        powerRampingStep                                            = 1;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_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
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -80,7 +80,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#oneHalf (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -85,7 +85,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#oneHalf (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14; //15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -84,7 +84,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#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
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -17,6 +17,9 @@ gNBs =

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

+    do_CSIRS                                                  = 0;
+    do_SRS                                                    = 0;
+
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -80,7 +83,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#oneHalf (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -82,7 +82,7 @@ gNBs =
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
+#oneHalf (0..15) 4,8,12,16,...60,64
        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
--- a/ci-scripts/docker/Dockerfile.physim.ubuntu
+++ b/ci-scripts/docker/Dockerfile.physim.ubuntu
@@ -1,47 +0,0 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 24.04
-#
-#---------------------------------------------------------------------
-
-FROM ran-base:develop AS ran-tests
-
-#RUN apt-get update && \
-#    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
-#    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-#        libgtest-dev \
-#        libyaml-cpp-dev
-
-RUN rm -Rf /oai-ran
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-# TODO should SANITIZE be ON? it makes it compile much longer
-RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
-        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
-        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
-        .. && \
-    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -242,22 +242,10 @@ def ExecuteActionWithParam(action, ctx):
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
 		success = cls_oaicitest.IdleSleep(HTML, int(st))

-	elif action == 'Deploy_Run_OC_PhySim':
+	elif action == 'Deploy_Run_PhySim':
 		oc_release = test.findtext('oc_release')
 		node = test.findtext('node') or None
-		script = "scripts/oc-deploy-physims.sh"
-		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
-		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
-		workdir = CLUSTER.eNBSourceCodePath
-		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
-
-	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
-		node = test.findtext('node') or None
-		ctest_opt = test.findtext('ctest-opt') or ''
-		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
-		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
-		workdir = CONTAINERS.eNBSourceCodePath
-		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
+		success = CLUSTER.deploy_oc_physim(ctx, HTML, oc_release, node)

 	elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork':
 		cn_id = test.findtext('cn_id')
@@ -286,6 +274,13 @@ def ExecuteActionWithParam(action, ctx):
 				return True
 			success = CONTAINERS.Create_Workspace(node, HTML)

+	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'
+		node = test.findtext('node')
+		success = cls_native.Native.Run_Physim(ctx, HTML, node, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)
+
 	elif action == 'LicenceAndFormattingCheck':
 		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)
@@ -321,15 +316,11 @@ def ExecuteActionWithParam(action, ctx):
 			# Change all execution targets to localhost
 			node = 'localhost'
 		command = test.findtext('command')
-		# Allow referencing repository workspace path in XML via %%workspace%%
-		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)

 	elif action == 'Custom_Script':
 		node = test.findtext('node')
 		script = test.findtext('script')
-		# Allow referencing repository workspace path in XML via %%workspace%%
-		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Script(HTML, node, script)

 	elif action == 'Pull_Cluster_Image':
--- a/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
+++ b/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
@@ -1,7 +1,3 @@
 set -x

 sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
-
-IF=wwan0
-sudo ip link set ${IF} down
-sudo ip addr flush dev ${IF}
--- a/ci-scripts/run_locally.sh
+++ b/ci-scripts/run_locally.sh
@@ -15,18 +15,16 @@ fi

 # The script assumes you've build the following images:
 #
-# docker build . -f docker/Dockerfile.gNB.ubuntu -t oai-gnb
-# docker build . -f docker/Dockerfile.nr-cuup.ubuntu -t oai-nr-cuup
-# docker build . -f docker/Dockerfile.nrUE.ubuntu -t oai-nr-ue
+# docker build . -f docker/Dockerfile.gNB.ubuntu22 -t oai-gnb
+# docker build . -f docker/Dockerfile.nrUE.ubuntu22 -t oai-nr-ue
 #
 # The images above depend on the following images:
 #
-# docker build . -f docker/Dockerfile.build.ubuntu -t ran-build
-# docker build . -f docker/Dockerfile.base.ubuntu -t ran-base
+# docker build . -f docker/Dockerfile.build.ubuntu22 -t ran-build
+# dokcer build . -f docker/Dockerfile.base.ubuntu22 -t ran-base

 docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
 docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
-docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}

 python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
--- a/ci-scripts/scripts/create_workspace.sh
+++ b/ci-scripts/scripts/create_workspace.sh
@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins"
 git config advice.detachedHead false
 mkdir -p cmake_targets/log
 git checkout -f ${ref}
-[ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
+[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI"
 exit 0
--- a/ci-scripts/scripts/docker-build-and-deploy-physims.sh
+++ b/ci-scripts/scripts/docker-build-and-deploy-physims.sh
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-function die() { echo $@; exit 1; }
-[ $# -ge 1 ] || die "usage: $0 <directory> [ctest-options]"
-
-IMAGE=ran-physimtests:ci-temp
-CONTAINER=ran-physimtests
-function cleanup-docker() {
-  docker stop ${CONTAINER}
-  docker rm ${CONTAINER}
-  docker rmi ${IMAGE}
-  docker volume prune --force
-}
-trap cleanup-docker EXIT
-
-set -x
-DIR=$1
-RESULT_DIR=${DIR}/
-shift
-CTEST_OPT=$@
-
-# build physims
-docker build --progress=plain --tag ${IMAGE} --file ${DIR}/ci-scripts/docker/Dockerfile.physim.ubuntu ${DIR} &>> ${RESULT_DIR}/physim_log.txt
-if [ $? -ne 0 ]; then
-  echo "build of physims failed"
-  exit 1
-fi
-
-# get a JSON description of all tests to run
-docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --show-only=json-v1 &> ${RESULT_DIR}/desc-tests.json
-JSON_RES=$?
-
-# run the actual tests: we don't suppy --rm as we have to copy the files
-# similar to unit tests, we can't mount the file where we write physims-5g-run.xml to
-# as it would write a file as root, but this script is run as a normal user
-docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --name ${CONTAINER} ${IMAGE} ctest ${CTEST_OPT} --output-junit results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${RESULT_DIR}/physim_log.txt
-RUN_RES=$?
-docker cp ${CONTAINER}:/oai-ran/build/results-run.xml ${RESULT_DIR}/
-docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTestsFailed.log ${RESULT_DIR}/
-docker cp ${CONTAINER}:/oai-ran/build/Testing/Temporary/LastTest.log ${RESULT_DIR}/
-
-# if both were successful, return 0
-# TODO not sure
-#[[ $JSON_RES -eq 0 && $RUN_RES -eq 0 ]] && exit 0
-
-exit 0
--- a/ci-scripts/scripts/oc-deploy-physims.sh
+++ b/ci-scripts/scripts/oc-deploy-physims.sh
@@ -1,5 +1,7 @@
 #!/bin/bash

+set -e
+
 function die() { echo $@; exit 1; }
 [ $# -eq 4 ] || die "usage: $0 <namespace> <release> <image tag> <oai directory>"

@@ -9,31 +11,23 @@ IMG_TAG=${3}
 OAI_DIR=${4}

 cat /opt/oc-password | oc login -u oaicicd --server https://api.oai.cs.eurecom.fr:6443 > /dev/null
-set -x
 oc project ${OC_NS} > /dev/null
 oc tag oaicicd-ran/oai-physim:${IMG_TAG} ${OC_NS}/oai-physim:${IMG_TAG}
-helm install ${OC_RELEASE} ${OAI_DIR}/charts/${OC_RELEASE} --set global.image.version=${IMG_TAG} --wait --timeout 120s
-set +x
+helm install ${OC_RELEASE} ${OAI_DIR}/charts/${OC_RELEASE} --set global.image.version=${IMG_TAG} --wait
 POD_ID=$(oc get pods | grep oai-${OC_RELEASE} | awk '{print $1}')
-wait_creating=30
-while [[ $(oc describe pod "$POD_ID" | grep "ContainerCreating") && ${wait_creating} > 0 ]]; do
-  sleep 1;
-  let wait_creating=$wait_creating-1
-done
+sleep 10
 echo "Monitoring logs for 'FINISHED' in pod '$POD_ID'"
 oc logs -f -n ${OC_NS} "$POD_ID" | while read -r line; do
  if [[ "$line" == *"FINISHED"* ]]; then
    echo "'FINISHED' detected in logs. Copying logs..."
-    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTestsFailed.log ${OAI_DIR}/LastTestsFailed.log
-    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTest.log ${OAI_DIR}/LastTest.log
-    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-tests.json ${OAI_DIR}/desc-tests.json
-    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-run.xml ${OAI_DIR}/results-run.xml
+    oc logs -n ${OC_NS} "$POD_ID" >> ${OAI_DIR}/ci-scripts/physim_log.txt
+    oc describe pod $POD_ID >> ${OAI_DIR}/ci-scripts/physim_pods_summary.txt
+    oc cp "$POD_ID":/opt/oai-physim/Testing/Temporary/LastTestsFailed.log ${OAI_DIR}/ci-scripts/LastTestsFailed.log
+    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-tests.json ${OAI_DIR}/ci-scripts/${OC_RELEASE}-tests.json
+    oc cp "$POD_ID":/opt/oai-physim/${OC_RELEASE}-run.xml ${OAI_DIR}/ci-scripts/${OC_RELEASE}-run.xml
    break
  fi
 done
-set -x
-oc logs -n ${OC_NS} "$POD_ID" >> ${OAI_DIR}/physim_log.txt
-oc describe pod $POD_ID >> ${OAI_DIR}/physim_log.txt
 helm uninstall ${OC_RELEASE} --wait
 oc delete istag oai-physim:${IMG_TAG} -n ${OC_NS}
 oc logout > /dev/null
--- a/ci-scripts/scripts/source-deploy-physims.sh
+++ b/ci-scripts/scripts/source-deploy-physims.sh
@@ -1,30 +0,0 @@
-
-function die() { echo $@; exit 1; }
-[ $# -ge 1 ] || die "usage: $0 <directory> [ctest-options]"
-
-set -x
-DIR=$1
-shift
-CTEST_OPT=$@
-
-cd ${DIR}/cmake_targets/ran_build/build
-ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
-
-# get a JSON description of all tests to run
-ctest ${CTEST_OPT} --show-only=json-v1 &> ${DIR}/desc-tests.json
-JSON_RES=$?
-
-# we run the T2 offload tests, so provide some additional permissions
-# to be able to initialize DPDK
-sudo setcap cap_dac_override,cap_sys_admin+ep nr_ulsim
-sudo setcap cap_dac_override,cap_sys_admin+ep nr_dlsim
-ctest ${CTEST_OPT} --output-junit ${DIR}/results-run.xml --test-output-size-passed 100000 --test-output-size-failed 100000 &>> ${DIR}/physim_log.txt
-RUN_RES=$?
-cp Testing/Temporary/LastTestsFailed.log ${DIR}/
-cp Testing/Temporary/LastTest.log ${DIR}/
-
-# if both were successful, return 0
-# TODO not sure
-#[[ $JSON_RES -eq 0 && $RUN_RES -eq 0 ]] && exit 0
-
-exit 0
--- a/ci-scripts/scripts/sys-info.sh
+++ b/ci-scripts/scripts/sys-info.sh
@@ -1,17 +0,0 @@
-CORES=$(nproc)
-MODEL=$(lscpu | awk -F: '/Model name/ {print $2; exit}' | xargs)
-MAX_FREQ=$(lscpu | awk -F: '/CPU max MHz/ {printf "%.2f MHz", $2; exit}')
-CURRENT_FREQ=$(awk -F: '/cpu MHz/ {printf " %.2f MHz", $2; exit}' /proc/cpuinfo)
-RAM=$(free -h --si | awk '/Mem:/ {print $2}')
-# sudo -n: non-interactive, will silently fail in case we don't have privileges
-DMID=$(sudo -n dmidecode -t memory 2>/dev/null)
-if [ $? -eq 0 ]; then
-  RAM_TYPE=$(echo "$DMID" | awk -F: '/Type:/ {print $2}' | grep -Ev 'Unknown|Other|None' | head -1 | xargs)
-else
-  RAM_TYPE="can't query"
-fi
-
-
-echo "CPU: model ${MODEL}"
-echo "${CORES} cores, max CPU freq ${MAX_FREQ}, current ${CURRENT_FREQ}"
-echo "RAM ${RAM} type ${RAM_TYPE}"
--- a/ci-scripts/tests/cmd.py
+++ b/ci-scripts/tests/cmd.py
@@ -36,20 +36,17 @@ class TestCmd(unittest.TestCase):
            self.assertEqual(ret.stdout, "test")

    def test_local_script(self):
-        with cls_cmd.getConnection("localhost") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-world.sh", 1)
+        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-world.sh", 1)
        self.assertEqual(ret.args, "tests/scripts/hello-world.sh")
        self.assertEqual(ret.returncode, 0)
        self.assertEqual(ret.stdout, "+ echo hello, world\nhello, world")

-        with cls_cmd.getConnection("localhost") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL")
+        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-fail.sh", 1, "TESTFAIL")
        self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL")
        self.assertEqual(ret.returncode, 1)
        self.assertEqual(ret.stdout, "TESTFAIL")

-        with cls_cmd.getConnection("localhost") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
+        ret = cls_cmd.runScript("localhost", "tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
        self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL2 &> /tmp/result")
        self.assertEqual(ret.returncode, 1)
        self.assertEqual(ret.stdout, "")
@@ -78,20 +75,17 @@ class TestCmd(unittest.TestCase):

    @unittest.skip("need to be able to passwordlessly SSH to localhost, also disable stty -ixon")
    def test_remote_script(self):
-        with cls_cmd.getConnection("127.0.0.1") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-world.sh", 1)
+        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-world.sh", 1)
        self.assertEqual(ret.args, "tests/scripts/hello-world.sh")
        self.assertEqual(ret.returncode, 0)
        self.assertEqual(ret.stdout, "+ echo hello, world\nhello, world")

-        with cls_cmd.getConnection("127.0.0.1") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL")
+        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-fail.sh", 1, "TESTFAIL")
        self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL")
        self.assertEqual(ret.returncode, 1)
        self.assertEqual(ret.stdout, "TESTFAIL")

-        with cls_cmd.getConnection("127.0.0.1") as ssh:
-            ret = ssh.exec_script("tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
+        ret = cls_cmd.runScript("127.0.0.1", "tests/scripts/hello-fail.sh", 1, "TESTFAIL2", "/tmp/result")
        self.assertEqual(ret.args, "tests/scripts/hello-fail.sh TESTFAIL2 &> /tmp/result")
        self.assertEqual(ret.returncode, 1)
        self.assertEqual(ret.stdout, "")
--- a/ci-scripts/tests/pull-clean-int-registry.py
+++ b/ci-scripts/tests/pull-clean-int-registry.py
@@ -26,7 +26,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		# 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 = cls_containerize.DEFAULT_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
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,6 +1,7 @@
  - Build_Proxy
  - Build_Cluster_Image
  - Pull_Cluster_Image
+  - Run_Physim
  - Build_eNB
  - Initialize_eNB
  - Terminate_eNB
@@ -22,9 +23,7 @@
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
-  - Deploy_Run_OC_PhySim
-  - Build_Deploy_Docker_PhySim
-  - Build_Deploy_Source_PhySim
+  - Deploy_Run_PhySim
  - LicenceAndFormattingCheck
  - Push_Local_Registry
  - Pull_Local_Registry
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -44,7 +44,7 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
+                <node>obelix</node>
                <images>oai-enb oai-lte-ue</images>
        </testCase>
        <testCase id="800813">
@@ -88,16 +88,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE</desc>
                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>obelix</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping trf-gen from LTE-UE 1</desc>
                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -106,9 +106,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE 1 from trf-gen</desc>
                <id>l2sim4g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -117,9 +117,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP Downlink</desc>
                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <iperf_args>-u -t 30 -b 1M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -129,9 +129,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP Uplink</desc>
                <id>l2sim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <iperf_args>-u -t 30 -b 3M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -149,7 +149,7 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
+                <node>obelix</node>
                <images>oai-enb oai-lte-ue</images>
        </testCase>

--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -136,8 +136,8 @@
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>localhost</nodes>
-                <svr_node>localhost</svr_node>
+                <nodes>acamas</nodes>
+                <svr_node>acamas</svr_node>
        </testCase>

        <testCase id="030011">
@@ -148,8 +148,8 @@
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <nodes>localhost</nodes>
-                <svr_node>localhost</svr_node>
+                <nodes>acamas</nodes>
+                <svr_node>acamas</svr_node>
        </testCase>

        <testCase id="100011">
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -83,9 +83,9 @@
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -94,9 +94,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from eNB</desc>
                <id>rfsim4g_enb_nos1</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -105,9 +105,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -117,9 +117,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,9 +132,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,9 +132,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
@@ -80,9 +80,9 @@
                <class>Iperf2_Unidir</class>
                <desc>Iperf2 UDP DL</desc>
                <id>rfsim4g_ue_fembms</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_fembms</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
@@ -80,9 +80,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -103,9 +103,9 @@
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -114,9 +114,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -125,9 +125,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -137,9 +137,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -76,16 +76,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>localhost localhost localhost</nodes>
+                <nodes>acamas acamas acamas</nodes>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>localhost localhost localhost</nodes>
+                <nodes>acamas acamas acamas</nodes>
                <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -55,10 +55,6 @@
 000031
 020022
 040026
- 040025
- 000031
- 020022
- 040027
 100021
 222222
        </TestCaseRequestedList>
@@ -68,7 +64,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -107,7 +103,7 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="000024">
@@ -122,9 +118,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,30 +128,30 @@
        <testCase id="030020">
                <class>Custom_Command</class>
                <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
        </testCase>

        <testCase id="030021">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+                <desc>Iperf (DL/5Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 5M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030022">
                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -163,7 +159,7 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Trigger Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
        </testCase>

@@ -171,9 +167,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.5 -w25</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -181,56 +177,56 @@
        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
        </testCase>

        <testCase id="040021">
                <class>Custom_Command</class>
                <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
        </testCase>

        <testCase id="040022">
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
        </testCase>

        <testCase id="040023">
                <class>Custom_Command</class>
                <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
        </testCase>

        <testCase id="040024">
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
        </testCase>

        <testCase id="040025">
                <class>Custom_Command</class>
                <desc>Trigger Handover</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
        </testCase>

        <testCase id="040026">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
        </testCase>

        <testCase id="040027">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
        </testCase>

@@ -249,7 +245,7 @@
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
+                <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
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -88,9 +88,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -100,9 +100,9 @@
                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -112,9 +112,9 @@
                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 30</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -125,16 +125,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -143,9 +143,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -154,9 +154,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from Second NR-UE</desc>
                <id>rfsim5g_ue2</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -165,9 +165,9 @@
                <class>Ping</class>
                <desc>Ping Second NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -176,9 +176,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from both UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
+                <nodes>acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -187,33 +187,33 @@
                <class>Ping</class>
                <desc>Ping ext-dn from all UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -222,21 +222,21 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
+                <nodes>acamas acamas</nodes>
        </testCase>

        <testCase id="444444">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>localhost localhost</nodes>
+                <nodes>acamas acamas</nodes>
        </testCase>

        <testCase id="444445">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 3 to 10</desc>
                <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
        </testCase>

        <testCase id="100001">
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -88,7 +88,7 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="000004">
@@ -101,9 +101,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args> -c 20 -i0.5</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -112,33 +112,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -146,14 +146,14 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Force Msg3 C-RNTI RA</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
        </testCase>

        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -88,33 +88,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -49,7 +49,7 @@
        <testCase id="004000">
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>acamas</node>
            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
        </testCase>
        <testCase id="800813">
@@ -77,9 +77,9 @@
                <class>Ping</class>
                <desc>Ping gNB from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -88,33 +88,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from gNB</desc>
                <id>rfsim5g_gnb_nos1</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

        <testCase id="030011">
                <class>Iperf</class>
-                <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030012">
                <class>Iperf</class>
-                <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -88,9 +88,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
@@ -1,205 +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-tdd-multiue</htmlTabRef>
-        <htmlTabName>Monolithic SA TDD gNB multiue</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 000008
- 020001
- 020002
- 020003
- 020004
- 020105
- 444445
- 030001
- 030002
- 444444
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
-
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
-
-        <testCase id="000003">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
-                <services>oai-nr-ue</services>
-        </testCase>
-
-        <testCase id="000008">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-        </testCase>
-
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</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>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_multiue1</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020003">
-                <class>Ping</class>
-                <desc>Ping ext-dn from Second NR-UE</desc>
-                <id>rfsim5g_multiue2</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020004">
-                <class>Ping</class>
-                <desc>Ping Second NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_multiue2</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020005">
-                <class>Ping</class>
-                <desc>Ping ext-dn from both UEs</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <nodes>localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020105">
-                <class>Ping</class>
-                <desc>Ping ext-dn from all UEs</desc>
-                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <nodes>localhost localhost localhost localhost localhost localhost localhost localhost localhost localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="444444">
-                <class>Detach_UE</class>
-                <desc>Detach OAI UEs</desc>
-                <id>rfsim5g_multiue1</id>
-                <nodes>localhost</nodes>
-        </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_rfsimulator_multiue</yaml_path>
-                <d_retx_th>1,0,0,0</d_retx_th>
-                <u_retx_th>1,0,0,0</u_retx_th>
-                <node>localhost</node>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue</images>
-        </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
@@ -1,199 +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-n2-ho</htmlTabRef>
-        <htmlTabName>F1 SA TDD N2 Handover</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000001
- 000002
- 000003
- 020001
- 000004
- 040001
- 050001
- 020001
- 020002
- 050002
- 030001
- 030002
- 050003
- 020001
- 020002
- 050004
- 050001
- 020001
- 020002
- 050002
- 100001
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
-        </testCase>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-
-        <testCase id="000001">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-        </testCase>
-
-        <testCase id="000002">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
-        </testCase>
-
-        <testCase id="000003">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-        </testCase>
-
-        <testCase id="000004">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
-        </testCase>
-
-        <testCase id="020001">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="020002">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
-                <ping_packetloss_threshold>10</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="030001">
-                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="030002">
-                <class>Iperf</class>
-                <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 1M -t 20</iperf_args>
-                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
-
-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
-        </testCase>
-
-        <testCase id="050003">
-                <class>Custom_Command</class>
-                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
-                <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
-        <testCase id="050004">
-                <class>Custom_Command</class>
-                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
-        </testCase>
-
-        <testCase id="100001">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
-                <d_retx_th>10,100,100,100</d_retx_th>
-                <u_retx_th>10,100,100,100</u_retx_th>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-cuup-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
@@ -74,16 +74,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -92,9 +92,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -102,7 +102,7 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Trigger Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
                <command_fail>yes</command_fail>
        </testCase>
@@ -111,9 +111,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.5 -w25</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -121,7 +121,7 @@
        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
                <command_fail>yes</command_fail>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
@@ -69,16 +69,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -87,9 +87,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
@@ -74,7 +74,7 @@
        <testCase id="000005">
                <class>Custom_Command</class>
                <desc>Check that UE synched</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -49,7 +49,7 @@
        <testCase id="004000">
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>acamas</node>
            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
        </testCase>
        <testCase id="800813">
@@ -83,9 +83,9 @@
                <class>Ping</class>
                <desc>Ping gNB from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -94,9 +94,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from gNB</desc>
                <id>rfsim5g_gnb_nos1</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -72,16 +72,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -90,9 +90,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -101,40 +101,40 @@
                <class>Attach_UE</class>
                <desc>Verify 2nd PDU session is up</desc>
                <id>rfsim5g_ue_pdu_2</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020003">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
                <id>rfsim5g_ue_pdu_2</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <nodes>localhost</nodes>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_image_build_arm.xml
+++ b/ci-scripts/xml_files/container_image_build_arm.xml
@@ -40,7 +40,7 @@
 		<class>Build_Image</class>
 		<desc>Build all Images</desc>
 		<node>gracehopper3-oai</node>
-		<kind>native_armv9</kind>
+		<kind>native_arm</kind>
 	</testCase>

        <testCase id="000010">
--- a/ci-scripts/xml_files/container_image_build_jetson.xml
+++ b/ci-scripts/xml_files/container_image_build_jetson.xml
@@ -1,53 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>build-tab</htmlTabRef>
-        <htmlTabName>Build Container Images for ARM</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 800813
- 000001
- 000010
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace for server 0</desc>
-                <node>jetson3-oai</node>
-        </testCase>
-        <testCase id="000001">
-                <class>Build_Image</class>
-                <desc>Build all Images</desc>
-                <node>jetson3-oai</node>
-                <kind>native_armv8</kind>
-        </testCase>
-
-        <testCase id="000010">
-                <class>Push_Local_Registry</class>
-                <desc>Push Images to Local Registry</desc>
-                <node>jetson3-oai</node>
-                <tag_prefix>armv8_</tag_prefix>
-        </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_aerial_cn_start.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_cn_start.xml
@@ -1,37 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-CN-START</htmlTabRef>
-        <htmlTabName>Deploy 5GC</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                555000
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="555000">
-                <class>DeployCoreNetwork</class>
-                <desc>Initialize 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aerial_cn_stop.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_cn_stop.xml
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-CN-STOP</htmlTabRef>
-        <htmlTabName>Undeploy 5GC</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                000555
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="000555">
-                <class>UndeployCoreNetwork</class>
-                <always_exec>true</always_exec>
-                <desc>Terminate 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -25,6 +25,7 @@
        <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
        <htmlTabIcon>tasks</htmlTabIcon>
        <TestCaseRequestedList>
+                555000
                111111
                000222
                800813
@@ -39,8 +40,15 @@
                000222
                222222
                333333
+                000555
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="555000">
+                <class>DeployCoreNetwork</class>
+                <desc>Initialize 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
+
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
@@ -152,5 +160,12 @@
                <node>gracehopper1-oai</node>
                <images>oai-gnb-aerial</images>
        </testCase>
+
+        <testCase id="000555">
+                <class>UndeployCoreNetwork</class>
+                <always_exec>true</always_exec>
+                <desc>Terminate 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
 </testCaseList>

--- a/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml
@@ -1,144 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-UL-Heavy</htmlTabRef>
-        <htmlTabName>AERIAL 100 MHz DSUUU SA</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                111111
-                000222
-                800813
-                002222
-                002223
-                000111
-                000011
-                000032
-                000033
-                000022
-                000222
-                222222
-                333333
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>gracehopper1-oai</node>
-                <images>oai-gnb-aerial</images>
-                <tag_prefix>arm_</tag_prefix>
-        </testCase>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace for server 0</desc>
-                <node>gracehopper1-oai</node>
-        </testCase>
-
-        <testCase id="002222">
-                <class>Deploy_Object</class>
-                <desc>Deploy PNF/Nvidia CUBB in a container</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <services>nv-cubb</services>
-        </testCase>
-
-        <testCase id="002223">
-                <class>Deploy_Object</class>
-                <desc>Deploy VNF in a container</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <services>oai-gnb-aerial</services>
-        </testCase>
-
-        <testCase id="000111">
-                <class>Attach_UE</class>
-                <desc>Attach Quectel</desc>
-                <id>up2-aerial</id>
-        </testCase>
-
-        <testCase id="000011">
-                <class>Ping</class>
-                <desc>Ping: 100pings in 20sec</desc>
-                <id>up2-aerial</id>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <ping_args>-c 100 -i 0.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="000022">
-                <class>Iperf</class>
-                <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 200M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000032">
-                <class>Iperf</class>
-                <desc>iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000033">
-                <class>Iperf</class>
-                <desc>iperf (UL/UDP/220M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 220M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000222">
-                <class>Detach_UE</class>
-                <always_exec>true</always_exec>
-                <desc>Detach Quectel</desc>
-                <id>up2-aerial</id>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy gNB</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <d_retx_th>20,100,100,100</d_retx_th>
-                <u_retx_th>20,100,100,100</u_retx_th>
-        </testCase>
-
-        <testCase id="333333">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>gracehopper1-oai</node>
-                <images>oai-gnb-aerial</images>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -36,6 +36,18 @@
    102002
    302002
    102003
+    102004
+    102005
+    102006
+    102007
+    102008
+    102009
+    102010
+    102011
+    102012
+    102013
+    102014
+    102015
    100100
    100010
    100020
@@ -106,8 +118,80 @@

  <testCase id="102003">
    <class>Attach_UE</class>
-    <desc>Attach UE 3 - 15</desc>
-    <id>amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <desc>Attach UE 3</desc>
+    <id>amarisoft_ue_3</id>
+  </testCase>
+
+  <testCase id="102004">
+    <class>Attach_UE</class>
+    <desc>Attach UE 4</desc>
+    <id>amarisoft_ue_4</id>
+  </testCase>
+
+  <testCase id="102005">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 5</desc>
+    <id>amarisoft_ue_5</id>
+  </testCase>
+
+  <testCase id="102006">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 6</desc>
+    <id>amarisoft_ue_6</id>
+  </testCase>
+
+  <testCase id="102007">
+    <class>Attach_UE</class>
+    <desc>Attach UE 7</desc>
+    <id>amarisoft_ue_7</id>
+  </testCase>
+
+  <testCase id="102008">
+    <class>Attach_UE</class>
+    <desc>Attach UE 8</desc>
+    <id>amarisoft_ue_8</id>
+  </testCase>
+
+  <testCase id="102009">
+    <class>Attach_UE</class>
+    <desc>Attach UE 9</desc>
+    <id>amarisoft_ue_9</id>
+  </testCase>
+
+  <testCase id="102010">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 10</desc>
+    <id>amarisoft_ue_10</id>
+  </testCase>
+
+  <testCase id="102011">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 11</desc>
+    <id>amarisoft_ue_11</id>
+  </testCase>
+
+  <testCase id="102012">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 12</desc>
+    <id>amarisoft_ue_12</id>
+  </testCase>
+
+  <testCase id="102013">
+    <class>Attach_UE</class>
+    <desc>Attach UE 13</desc>
+    <id>amarisoft_ue_13</id>
+  </testCase>
+
+  <testCase id="102014">
+    <class>Attach_UE</class>
+    <desc>Attach UE 14</desc>
+    <id>amarisoft_ue_14</id>
+  </testCase>
+
+  <testCase id="102015">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 15</desc>
+    <id>amarisoft_ue_15</id>
  </testCase>

  <testCase id="100010">
--- a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
@@ -1,268 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-F1-HO-B210</htmlTabRef>
-  <htmlTabName>F1 Handover 20 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    000001
-    000002
-    000003
-    000004
-    000005
-    000006
-    000007
-    000008
-    000009
-    000010
-    000011
-    000012
-    000013
-    000014
-    000015
-    000016
-    000017
-    000018
-    000019
-    000020
-    000021
-    000022
-    000023
-    000024
-    000025
-    000026
-    000027
-    000028
-
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-	
-  <testCase id="000001">
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-  <testCase id="000002">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000003">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000004">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace for groot</desc>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000005">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace on rocket</desc>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000006">
-    <class>Custom_Command</class>
-    <desc>Set attenuator to 0 for DU0 and 17 for DU1</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
-  </testCase>
-
-  <testCase id="000007">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-CU in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>groot</node>
-    <services>oai-cu</services>
-  </testCase>
-
-  <testCase id="000008">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <services>oai-du0</services>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000009">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>rocket</node>
-    <services>oai-du1</services>
-  </testCase>
-
-  <testCase id="000010">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000011">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000012">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="000013">
-    <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase id="000014">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000015">
-    <class>Custom_Command</class>
-    <desc>UE connected to DU1?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
-  </testCase>
-
-  <testCase id="000016">
-   <class>Custom_Command</class>
-    <desc>Attenuate DU1 by 17dB and remove attenuation on DU0 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
-  </testCase>
-
-  <testCase id="000017">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000018">
-    <class>Custom_Command</class>
-    <desc>UE connected to DU0?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
-  </testCase>
-
-  <testCase id="000019">
-   <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase id="000020">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000021">
-    <class>Custom_Command</class>
-    <desc>UE connected to DU1?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
-  </testCase>
-
-  <testCase id="000022">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000023">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy CU-DU0</desc>
-    <node>groot</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-  </testCase>
-
-  <testCase id="000024">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy DU1 </desc>
-    <node>rocket</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-  </testCase>
-
-  <testCase id="000025">
-   <class>Custom_Command</class>
-    <desc>Reset all channels on the attenuator to 0</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
-    <always_exec>true</always_exec>
-  </testCase>
-
-  <testCase id="000026">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>groot</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000027">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>rocket</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000028">
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
@@ -1,230 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-MONO-N2-HO-B210</htmlTabRef>
-  <htmlTabName>Monolithic N2 Handover 20 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    000001
-    000002
-    000023
-    000003
-    000004
-    000005
-    000006
-    000007
-    000008
-    000009
-    000010
-    000011
-    000012
-    000013
-    000014
-    000015
-    000017
-    000018
-    000019
-    000016
-    000020
-    000021
-    000022
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-	
-  <testCase id="000001">
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-  <testCase id="000002">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000023">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000003">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace for groot</desc>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000005">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace on rocket</desc>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000004">
-    <class>Custom_Command</class>
-    <desc>Set initial attenuation on target gNB</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
-  </testCase>
-
-  <testCase id="000005">
-    <class>Deploy_Object</class>
-    <desc>Deploy Monolithic gNB-PCI0 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-    <node>groot</node>
-    <services>oai-gnb-pci0</services>
-  </testCase>
-
-  <testCase id="000006">
-    <class>Deploy_Object</class>
-    <desc>Deploy Monolithic gNB-PCI1 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-    <node>rocket</node>
-    <services>oai-gnb-pci1</services>
-  </testCase>
-
-  <testCase id="000007">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000008">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000009">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="000010">
-    <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=15dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase id="000011">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000012">
-    <class>Custom_Command</class>
-    <desc>UE connected to gNB-PCI1?</desc>
-    <node>rocket</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
-  </testCase>
-
-  <testCase id="000013">
-    <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=15dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
-  </testCase>
-
-  <testCase id="000014">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000015">
-    <class>Custom_Command</class>
-    <desc>UE connected to gNB-PCI0?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
-  </testCase>
-
-  <testCase id="000016">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Reset all attenuators to 0dB</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
-  </testCase>
-
-  <testCase id="000017">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000018">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy Monolithic gNB-PCI0</desc>
-    <node>groot</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-  </testCase>
-
-  <testCase id="000019">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy Monolithic gNB-PCI1</desc>
-    <node>rocket</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-  </testCase>
-
-  <testCase id="000020">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>groot</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000021">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>rocket</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000022">
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
  <htmlTabRef>TEST-SA-FR1-N310-2x2-60MHz</htmlTabRef>
-  <htmlTabName>60 MHz 2x2 TDD SA DSUUU</htmlTabName>
+  <htmlTabName>60 MHz 2x2 TDD SA</htmlTabName>
  <htmlTabIcon>tasks</htmlTabIcon>
  <TestCaseRequestedList>
    100000
@@ -114,8 +114,8 @@

  <testCase id="071000">
    <class>Iperf</class>
-    <desc>iperf (DL/150Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 150M -t 30 -R</iperf_args>
+    <desc>iperf (DL/200Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 200M -t 30 -R</iperf_args>
    <svr_id>matix-cn5g</svr_id>
    <id>up2</id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -124,8 +124,8 @@

  <testCase id="071001">
    <class>Iperf</class>
-    <desc>iperf (UL/250Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 250M -t 30</iperf_args>
+    <desc>iperf (UL/180Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 180M -t 30</iperf_args>
    <svr_id>matix-cn5g</svr_id>
    <id>up2</id>
    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
@@ -147,8 +147,8 @@
    <node>matix</node>
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
    <services>oai-gnb</services>
-    <d_retx_th>15,100,100,100</d_retx_th>
-    <u_retx_th>20,100,100,100</u_retx_th>
+    <d_retx_th>10,100,100,100</d_retx_th>
+    <u_retx_th>10,100,100,100</u_retx_th>
  </testCase>

  <testCase id="333333">
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml
@@ -109,8 +109,8 @@

  <testCase id="000100">
    <class>Iperf</class>
-    <desc>iperf (DL/60Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 60M -t 30 -i 1 -R</iperf_args>
+    <desc>iperf (DL/30Mbps/UDP)(30 sec)</desc>
+    <iperf_args>-u -b 30M -t 30 -i 1 -R</iperf_args>
    <id>oai_ue_caracal</id>
    <svr_id>oc-cn5g</svr_id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
@@ -1,179 +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>LONGRUN-5G-NRUE</htmlTabRef>
-  <htmlTabName>Longrun 40 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-    010000 010001
-    800813
-    020000
-    800814
-    020001
-    000001
-    001000
-    000100
-    001000
-    000100
-    001000
-    000100
-    001000
-    000200
-    001000
-    000200
-    001000
-    000200
-    040001 040000
-    333333
-    444444
-    060001
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="060000">
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g</cn_id>
-  </testCase>
-
-  <testCase id="010000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-gnb</images>
-    <node>avra</node>
-  </testCase>
-
-  <testCase id="010001">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-nr-ue</images>
-    <node>caracal</node>
-  </testCase>
-
-  <testCase id="800813">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>avra</node>
-  </testCase>
-
-  <testCase id="020000">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
-    <node>avra</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <num_attempts>3</num_attempts>
-  </testCase>
-
-  <testCase id="800814">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>caracal</node>
-  </testCase>
-
-  <testCase id="020001">
-    <class>Deploy_Object</class>
-    <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-    <node>caracal</node>
-    <num_attempts>3</num_attempts>
-  </testCase>
-
-  <testCase id="000001">
-    <class>Attach_UE</class>
-    <desc>Attach OAIUE</desc>
-    <id>oai_ue_caracal</id>
-  </testCase>
-
-  <testCase id="000100">
-    <class>Iperf</class>
-    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="000200">
-    <class>Iperf</class>
-    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 2M -t 600 -i 1 </iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="001000">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="040000">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>avra</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <d_retx_th>20,100,100,100</d_retx_th>
-    <u_retx_th>20,100,100,100</u_retx_th>
-  </testCase>
-
-  <testCase id="040001">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy nr UE</desc>
-    <node>caracal</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>avra</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="444444">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>caracal</node>
-    <images>oai-nr-ue</images>
-  </testCase>
-
-  <testCase id="060001">
-    <class>UndeployCoreNetwork</class>
-    <desc>Terminate 5G Core</desc>
-    <always_exec>true</always_exec>
-    <cn_id>oc-cn5g</cn_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -42,7 +42,7 @@
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
 		<node>caracal</node>
-		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c --cmake-opt -DPHYSIM_CHECK_FILES="ThresholdsOffload.cmake"</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
 	</testCase>

 	<testCase id="100000">
--- a/ci-scripts/xml_files/ldpc_gpu_test.xml
+++ b/ci-scripts/xml_files/ldpc_gpu_test.xml
@@ -0,0 +1,396 @@
+<!--
+
+ 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
+
+ 030105 040301 040502 040606 040601 040603 040608 040605 040646 040641 040643 040648 040645 040401 040201 030201
+-->
+<testCaseList>
+	<htmlTabRef>test-ldpc-gpu</htmlTabRef>
+	<htmlTabName>Test-ldpc-GPU</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+		000002 000003 000004 000005 000006 000007 000008 000009 000010 000011 000012 000013 000014 000015 000016 000017 000018 000019 000020 000021
+		000022 000023 000024 000025 000026 000027 000028 000029 000030 000031 000032 000033 000034 000035 000036 000037 000038 000039 000040 000041
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000002">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3872 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000003">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3872 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000004">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4224 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000005">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4224 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000006">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4576 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000007">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4576 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000008">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4928 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000009">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 4928 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000010">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 5280 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000011">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 5280 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000012">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 5632 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000013">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 5632 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000014">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 6336 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000015">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 6336 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000016">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 7040 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000017">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 7040 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000018">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 7744 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000019">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 7744 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000020">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 8448 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000021">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 8448 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000022">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 1 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000023">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 1 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000024">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 100 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000025">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 100 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000026">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 193 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000027">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 193 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000028">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 500 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000029">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 500 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000030">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 561 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000031">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 561 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000032">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 600 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000033">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 600 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000034">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 641 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000035">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 641 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000036">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 2000 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000037">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 2000 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000038">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3000 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000039">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3000 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+	<testCase id="000040">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with CPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3840 -s10 -n100</physim_run_args>
+	</testCase>
+
+	<testCase id="000041">
+		<class>Run_Physim</class>
+		<desc>Run LDPC Test with GPU</desc>
+		<always_exec>true</always_exec>
+		<node>caracal</node>
+		<physim_test>ldpctest</physim_test>
+		<physim_run_args>-l 3840 -s10 -n100 -G 1</physim_run_args>
+	</testCase>
+
+
+
+</testCaseList>
--- a/ci-scripts/xml_files/physim_4g_deploy_run.xml
+++ b/ci-scripts/xml_files/physim_4g_deploy_run.xml
@@ -37,7 +37,7 @@
        </testCase>

        <testCase id="010201">
-		<class>Deploy_Run_OC_PhySim</class>
+		<class>Deploy_Run_PhySim</class>
                <desc>Deploy and run physical simulator on openshift</desc>
                <oc_release>physims-4g</oc_release>
                <node>avra</node>
--- a/ci-scripts/xml_files/physim_5g_deploy_run.xml
+++ b/ci-scripts/xml_files/physim_5g_deploy_run.xml
@@ -37,7 +37,7 @@
        </testCase>

        <testCase id="010201">
-		<class>Deploy_Run_OC_PhySim</class>
+		<class>Deploy_Run_PhySim</class>
                <desc>Deploy and run physical simulator on openshift</desc>
                <oc_release>physims-5g</oc_release>
                <node>avra</node>
--- a/ci-scripts/xml_files/physim_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_gracehopper.xml
@@ -1,46 +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>physim-tab</htmlTabRef>
-        <htmlTabName>PhySim</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
-          800813
-          010201
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-
-        <testCase id="010201">
-                <class>Build_Deploy_Docker_PhySim</class>
-                <desc>Build and Deploy PhySim</desc>
-                <node>localhost</node>
-                <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest" -j32</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/physim_timed_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_timed_gracehopper.xml
@@ -1,46 +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>physim-timed-tab</htmlTabRef>
-        <htmlTabName>PhySim with timing check</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
-          800813
-	  010202
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-
-	<testCase id="010202">
-		<class>Build_Deploy_Docker_PhySim</class>
-		<desc>Build and Deploy PhySim with timing check</desc>
-		<node>localhost</node>
-		<ctest-opt>-R 5g -R "nr_dlsim|nr_ulsim|ldpctest" -E physim.5g.nr_dlsim.mcs.mimo.test9 -j1</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
-	</testCase>
-
-</testCaseList>
--- a/Show More
+++ b/Show More