UE Context setup req/resp final

UE context setup req/resp changes
UE context setup req/resp
2026-07-14 05:00:31 +00:00 · 2024-06-26 18:13:40 +05:30 · 2024-06-25 15:59:07 +05:30 · 2024-06-24 11:08:11 +05:30 · 2024-06-20 13:02:46 +05:30 · 2024-06-19 11:50:51 +05:30
669 changed files with 40172 additions and 20584 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # RELEASE NOTES: #

+## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
+
+This release improves existing 5G support and adds various new features.
+
+* 5G gNB
+  - Add support for O-RAN 7.2 fronthaul interface
+    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
+  - Add support for 2-layer UL MIMO
+  - FDD interoperability with COTS UE
+  - Compiles on ARM (through SIMDE)
+  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
+  - Add support for E1AP
+  - Add support for multiple DUs and CU-UPs at one CU-CP
+  - FR2 SA with OAI UE
+  - Improve computational efficiency
+* 5G UE
+  - Cleanup in MAC and RRC towards support of 3rd-party gNB
+  - FR2 SA with OAI gNB
+  - Improve computational efficiency
+
+Overall the stability is improved for the same resource usage.
+
+There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
+interoperability is under testing.
+
+This release also includes many fixes and documentation updates.
+
 ## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##

 This release adds support for 5G and maintains previous features:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,8 +300,8 @@ set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
 set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
 message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")

-set(KPM_VERSION "KPM_V2" CACHE STRING "The KPM SM version to use")
-set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2" "KPM_V3")
+set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
+set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
 message(STATUS "Selected KPM Version: ${KPM_VERSION}")


@@ -500,10 +500,10 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
 if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.7)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
+  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
+  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find PMD T2")
+    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
  endif()
  message(STATUS "T2 build: use ${PMD_T2}")
  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
@@ -726,7 +726,6 @@ set(SCHED_SRC_NR_UE
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
 target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

-
 # nFAPI
 #################################
 set(NFAPI_COMMON_SRC
@@ -1384,9 +1383,11 @@ set (MAC_NR_SRC_UE
  ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
  ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
  ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue_sl.c
  ${NR_UE_MAC_DIR}/mac_vars.c
  ${NR_UE_MAC_DIR}/main_ue_nr.c
  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
@@ -1433,9 +1434,8 @@ target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

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


@@ -1458,11 +1458,10 @@ add_library(e1_if

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

-target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc xnap)
 if(E2_AGENT)
-  target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
-  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
-  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
+  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
@@ -1687,7 +1686,7 @@ set(libnas_ies_OBJS

 set (libnas_utils_OBJS
  ${NAS_SRC}COMMON/UTIL/device.c
-  ${NAS_SRC}COMMON/UTIL/memory.c
+  common/utils/mem/memory.c
  ${NAS_SRC}COMMON/UTIL/nas_timer.c
  ${NAS_SRC}COMMON/UTIL/socket.c
  ${NAS_SRC}COMMON/UTIL/stty.c
@@ -1981,8 +1980,7 @@ target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
 target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 if(E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE E2_AGENT)
-  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

 add_executable(oairu
@@ -2052,7 +2050,6 @@ add_executable(nr-softmodem
  ${rrc_h}
  ${nr_rrc_h}
  ${s1ap_h}
-#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-gnb.c
  ${OPENAIR_DIR}/executables/nr-ru.c
  ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2068,6 +2065,8 @@ add_executable(nr-softmodem
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  )

+include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
+
 target_link_libraries(nr-softmodem PRIVATE
  -Wl,--start-group
  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
@@ -2081,7 +2080,7 @@ target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
+  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()


@@ -2094,10 +2093,6 @@ endif()
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(nr-softmodem PRIVATE
  asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp)
-if(E2_AGENT)
-  target_compile_definitions(nr-softmodem PRIVATE E2_AGENT)
-endif()
-

 add_executable(nr-cuup
  executables/nr-cuup.c
@@ -2114,6 +2109,10 @@ target_link_libraries(nr-cuup PRIVATE
                      GTPV1U e1ap f1ap SIMU_ETH
                      z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
+if(E2_AGENT)
+  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
+  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
                     
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2121,7 +2120,6 @@ target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 add_executable(nr-uesoftmodem
  ${rrc_h}
  ${s1ap_h}
-#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2439,9 +2437,6 @@ make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
 # user space tool for configuring MESH IP driver
 ################
 add_executable(rb_tool
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/constant.h
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/ioctl.h
-  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -562,6 +562,29 @@ pipeline {
            }
          }
        }
+        stage ("SA-AERIAL-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-AERIAL-CN5G', 'SA-AERIAL-CN5G')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                saAERIALStatus = finalizeSlaveJob('RAN-SA-AERIAL-CN5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += saAERIALStatus
+              }
+            }
+          }
+        }
        stage ("SA-OAIUE-CN5G") {
          when { expression {do5Gtest} }
          steps {
--- a/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
@@ -0,0 +1,281 @@
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 2
+#define N_ANTENNA_UL 2
+#define TDD 1
+
+log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and
+allow dynamic UE creation from remote API */
+
+  cell_groups: [{
+      group_type: "nr",
+      multi_ue: true,
+      cells: [{
+      rf_port: 0,
+      bandwidth: 20,
+      band: 78,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: N_ANTENNA_UL,
+      rx_to_tx_latency:2,
+    }],
+  }],
+
+  /* UE capabilities */
+  /* USIM data */
+  ue_list: [
+    {
+      "ue_id" : 1,
+      "imsi": "208970000000111",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 2,
+      "imsi": "208970000000112",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 3,
+      "imsi": "208970000000113",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 4,
+      "imsi": "208970000000114",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 5,
+      "imsi": "208970000000115",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 6,
+      "imsi": "208970000000116",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 7,
+      "imsi": "208970000000100",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 8,
+      "imsi": "208970000000102",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 9,
+      "imsi": "208970000000103",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 10,
+      "imsi": "208970000000104",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 11,
+      "imsi": "208970000000110",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 12,
+      "imsi": "208970000000105",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 13,
+      "imsi": "208970000000106",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+        {
+      "ue_id" : 14,
+      "imsi": "208970000000107",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 15,
+      "imsi": "208970000000108",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 16,
+      "imsi": "208970000000109",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+ ],
+}
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/ci-scripts/checkCodingFormattingRules.sh
@@ -74,8 +74,9 @@ then
       IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
       IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
       IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
+       IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FILE || true`
       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
+       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
       then
           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
           then
@@ -184,8 +185,9 @@ do
            IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
            IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
            IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
+            IS_MIT_LICENCE_PRESENT=`egrep -c "MIT License" $FULLFILE || true`
            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
-            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
+            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] && [ $IS_MIT_LICENCE_PRESENT -eq 0 ]
            then
                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
                then
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -9,12 +9,21 @@ idefix:
  MTU: 1500
  Trace: True
  LogStore: /media/usb-drive/ci_qlogs
-nrmodule2_quectel:
-  Host: nrmodule2
-  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+
+up2:
+  Host: up2
+  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
+  NetworkScript: ip a show dev wwan0
+  IF: wwan0
+  MTU: 1500
+
+sphex_quectel:
+  Host: sphex
+  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
  TermScript: sudo -S killall --signal SIGKILL quectel-CM
-  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
-  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 detach
  NetworkScript: ip a show dev wwan0
  IF: wwan0
  MTU: 1500
@@ -49,7 +58,7 @@ adb_ue_2:

 amarisoft_ue:
  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
  Host: amariue
@@ -121,6 +130,48 @@ amarisoft_ue_10:
  NetworkScript: ip netns exec ue10 ip a show dev pdn0
  CmdPrefix: ip netns exec ue10
  MTU: 1500
+amarisoft_ue_11:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
+  NetworkScript: ip netns exec ue11 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue11
+  MTU: 1500
+amarisoft_ue_12:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
+  NetworkScript: ip netns exec ue12 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue12
+  MTU: 1500
+amarisoft_ue_13:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
+  NetworkScript: ip netns exec ue13 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue13
+  MTU: 1500
+amarisoft_ue_14:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
+  NetworkScript: ip netns exec ue14 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue14
+  MTU: 1500
+amarisoft_ue_15:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
+  NetworkScript: ip netns exec ue15 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue15
+  MTU: 1500
+amarisoft_ue_16:
+  Host: amariue
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
+  NetworkScript: ip netns exec ue16 ip a show dev pdn0
+  CmdPrefix: ip netns exec ue16
+  MTU: 1500

 oai_ue_caracal:
  Host: caracal
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -132,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
+		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -274,6 +274,11 @@ class Cluster:
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
+			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			if not forceBaseImageBuild and result is not None:
+				forceBaseImageBuild = True
+				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -86,6 +86,12 @@ class Cmd(metaclass=abc.ABCMeta):
 		return

 class LocalCmd(Cmd):
+	def __enter__(self):
+		return self
+
+	def __exit__(self, exc_type, exc_value, exc_traceback):
+		self.close()
+
 	def __init__(self, d = None):
 		self.cwd = d
 		if self.cwd is not None:
@@ -122,12 +128,40 @@ class LocalCmd(Cmd):
 		if src[0] != '/' or tgt[0] != '/':
 			raise Exception('support only absolute file paths!')
 		opt = '-r' if recursive else ''
-		self.run(f'cp {opt} {src} {tgt}')
+		return self.run(f'cp {opt} {src} {tgt}').returncode == 0

 	def copyout(self, src, tgt, recursive=False):
-		self.copyin(src, tgt, recursive)
+		return self.copyin(src, tgt, recursive)
+
+def PutFile(client, src, tgt):
+	success = True
+	sftp = client.open_sftp()
+	try:
+		sftp.put(src, tgt)
+	except FileNotFoundError as error:
+		logging.error(f"error while putting {src}: {error}")
+		success = False
+	sftp.close()
+	return success
+
+def GetFile(client, src, tgt):
+	success = True
+	sftp = client.open_sftp()
+	try:
+		sftp.get(src, tgt)
+	except FileNotFoundError as error:
+		logging.error(f"error while getting {src}: {error}")
+		success = False
+	sftp.close()
+	return success

 class RemoteCmd(Cmd):
+	def __enter__(self):
+		return self
+
+	def __exit__(self, exc_type, exc_value, exc_traceback):
+		self.close()
+
 	def __init__(self, hostname, d=None):
 		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
@@ -193,36 +227,38 @@ class RemoteCmd(Cmd):
 	def getBefore(self):
 		return self.cp.stdout

+	# if recursive is True, tgt must be a directory (and src is file or directory)
+	# if recursive is False, tgt and src must be a file name
 	def copyout(self, src, tgt, recursive=False):
 		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			cmd = LocalCmd()
-			cmd.run(f"tar -cf {abstmpfile} {src}")
-			sftp = self.client.open_sftp()
-			sftp.put(abstmpfile, abstmpfile)
-			sftp.close()
-			cmd.run(f"rm {abstmpfile}")
-			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+			with LocalCmd() as cmd:
+				if cmd.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
+					return False
+				if not PutFile(self.client, abstmpfile, abstmpfile):
+					return False
+				cmd.run(f"rm {abstmpfile}")
+				ret = self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+				return ret.returncode == 0
 		else:
-			sftp = self.client.open_sftp()
-			sftp.put(src, tgt)
-			sftp.close()
+			return PutFile(self.client, src, tgt)

+	# if recursive is True, tgt must be a directory (and src is file or directory)
+	# if recursive is False, tgt and src must be a file name
 	def copyin(self, src, tgt, recursive=False):
 		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
 		if recursive:
 			tmpfile = f"{uuid.uuid4()}.tar"
 			abstmpfile = f"/tmp/{tmpfile}"
-			self.run(f"tar -cf {abstmpfile} {src}")
-			sftp = self.client.open_sftp()
-			sftp.get(abstmpfile, abstmpfile)
-			sftp.close()
+			if self.run(f"tar -cf {abstmpfile} {src}").returncode != 0:
+				return False
+			if not GetFile(self.client, abstmpfile, abstmpfile):
+				return False
 			self.run(f"rm {abstmpfile}")
-			cmd = LocalCmd()
-			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+			with LocalCmd() as cmd:
+				ret = cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+				return ret.returncode == 0
 		else:
-			sftp = self.client.open_sftp()
-			sftp.get(src, tgt)
-			sftp.close()
+			return GetFile(self.client, src, tgt)
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial']

 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -357,11 +357,11 @@ class Containerize():
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
 			self.dockerfileprefix = '.ubuntu20'
-			self.cliBuildOptions = '--no-cache'
+			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--no-cache --disable-compression'
+			self.cliBuildOptions = '--disable-compression'

 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
@@ -383,6 +383,7 @@ class Containerize():
 				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
 				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
@@ -419,19 +420,23 @@ class Containerize():
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
+			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
+			if not forceBaseImageBuild and result is not None:
+				forceBaseImageBuild = True
+				baseTag = 'ci-temp'
 		else:
 			forceBaseImageBuild = True

 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
-		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		for image,pattern,name,option in imageNames:
 			cmd.run(f"{self.cli} image rm {name}:{imageTag}")

 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
@@ -445,7 +450,7 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
+			return False
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -476,7 +481,11 @@ class Containerize():
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			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.2023.11.28.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
+			if image == 'oai-gnb-aerial':
+				cmd.run('rm -f nvipc_src.2023.11.28.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -506,11 +515,16 @@ class Containerize():
 			cmd.run(f"{self.cli} image prune --force")

 		# Remove all intermediate build images and clean up
-		if self.ranAllowMerge and forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")

+		# Remove some cached artifacts to prevent out of diskspace problem
+		logging.debug(cmd.run("df -h").stdout)
+		logging.debug(cmd.run("docker system df").stdout)
+		cmd.run(f"{self.cli} buildx prune --filter until=1h --force")
+		logging.debug(cmd.run("df -h").stdout)
+		logging.debug(cmd.run("docker system df").stdout)
+
 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -523,12 +537,13 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			sys.exit(1)
+			return False

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

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

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

@@ -656,22 +671,107 @@ class Containerize():
 		collectInfo['proxy'] = files
 		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
 		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+		# Cleaning any created tmp volume
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
+
 		allImagesSize = {}
 		if result is not None:
 			imageSize = float(result.group('size')) / 1000000
 			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
 			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+			return True
 		else:
-			logging.debug('proxy size is unknown')
+			logging.error('proxy size is unknown')
 			allImagesSize['proxy'] = 'unknown'
+			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
+			return False

-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
+	def BuildRunTests(self, HTML):
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('Building on server: ' + lIpAddr)
+		cmd = cls_cmd.RemoteCmd(lIpAddr)
+		cmd.cd(lSourcePath)

-		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
-		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
+		ret = cmd.run('hostnamectl')
+		result = re.search('Ubuntu', ret.stdout)
+		host = result.group(0)
+		if host != 'Ubuntu':
+			cmd.close()
+			raise Exception("Can build unit tests only on Ubuntu server")
+		logging.debug('running on Ubuntu as expected')
+
+		if self.forcedWorkspaceCleanup:
+			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
+		self.testCase_id = HTML.testCase_id
+	
+		# check that ran-base image exists as we expect it
+		baseImage = 'ran-base'
+		baseTag = 'develop'
+		if self.ranAllowMerge:
+			if self.ranTargetBranch == 'develop':
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
+				result = re.search('index', cmd.getBefore())
+				if result is not None:
+					baseTag = 'develop'
+		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
+		if ret.returncode != 0:
+			logging.error(f'No {baseImage} image present, cannot build tests')
+			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTabFooter(False)
+			return False
+
+		# build ran-unittests image
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
+		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
+		if ret.returncode != 0:
+			logging.error(f'Cannot build unit tests')
+			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
+			HTML.CreateHtmlTabFooter(False)
+			return False
+
+		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
+
+		# it worked, build and execute tests, and close connection
+		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
+		cmd.run(f'docker rmi ran-unittests:develop')
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
+		cmd.close()
+
+		if ret.returncode == 0:
+			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
+			HTML.CreateHtmlTabFooter(True)
+			return True
+		else:
+			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
+			HTML.CreateHtmlTabFooter(False)
+			return False

 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
@@ -864,12 +964,12 @@ class Containerize():
 		if svcName == '':
 			logging.warning('no service name given: starting all services in ci-docker-compose.yml!')

-		mySSH.command(f'docker-compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
+		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)

 		# Checking Status
 		grep = ''
-		if svcName != '': grep = f' | grep -A3 {svcName}'
-		mySSH.command(f'docker-compose --file ci-docker-compose.yml config {grep}', '\$', 5)
+		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
+		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
@@ -917,8 +1017,8 @@ class Containerize():
 		if healthyNb == 1:
 			cnt = 0
 			while (cnt < 20):
-				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting"', '\$', 30)
-				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured', mySSH.getBefore())
+				mySSH.command('docker logs ' + containerName + ' | egrep --text --color=never -i "wait|sync|Starting|ready"', '\$', 30)
+				result = re.search('got sync|Starting E1AP at CU UP|Starting F1AP at CU|Got sync|Waiting for RUs to be configured|cuPHYController initialized|Received CONFIG.response, gNB is ready', mySSH.getBefore())
 				if result is None:
 					time.sleep(6)
 					cnt += 1
@@ -971,78 +1071,80 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
-
-		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-
+		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
+		mySSH = cls_cmd.getConnection(lIpAddr)
+		yamlDir = f'{lSourcePath}/{self.yamlPath[self.eNB_instance]}'
+		mySSH.run(f'cd {yamlDir}')
 		svcName = self.services[self.eNB_instance]
 		forceDown = False
 		if svcName != '':
 			logging.warning(f'service name given, but will stop all services in ci-docker-compose.yml!')
 			svcName = ''

-		mySSH.command(f'docker-compose -f ci-docker-compose.yml config --services', '\$', 5)
+		ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml config --services')
+		if ret.returncode != 0:
+			HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', "cannot enumerate running services")
+			self.exitStatus = 1
+			return
 		# first line has command, last line has next command prompt
-		allServices = mySSH.getBefore().split('\r\n')[1:-1]
+		allServices = ret.stdout.splitlines()
 		services = []
 		for s in allServices:
-			mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
-			running = mySSH.getBefore().split('\r\n')[2:-1]
+			# outputs the hash if the container is running
+			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
+			running = ret.stdout.splitlines()
 			logging.debug(f'running services: {running}')
-			if len(running) > 0: # something is running for that service
+			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
 				services.append(s)
 		logging.info(f'stopping services {services}')

-		mySSH.command(f'docker-compose -f ci-docker-compose.yml stop -t3', '\$', 30)
-		time.sleep(5)  # give some time to running containers to stop
+		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
+		copyin_res = True
 		for svcName in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
 			filename = f'{svcName}-{HTML.testCase_id}.log'
-			mySSH.command(f'docker-compose -f ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}', '\$', 120)
+			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
+			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res

-		mySSH.command('docker-compose -f ci-docker-compose.yml down -v', '\$', 5)
-		mySSH.close()
+		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')

 		# Analyzing log file!
-		files = ','.join([f'{s}-{HTML.testCase_id}' for s in services])
-		if len(services) > 1:
-			files = '{' + files + '}'
-		copyin_res = 0
-		if len(services) > 0:
-			copyin_res = mySSH.copyin(lIpAddr, lUserName, lPassWord, f'{lSourcePath}/cmake_targets/log/{files}.log', '.')
-		if copyin_res == -1:
-			HTML.htmleNBFailureMsg='Could not copy logfile to analyze it!'
+		if not copyin_res:
+			HTML.htmleNBFailureMsg='Could not copy logfile(s) to analyze it!'
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
 		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
 			self.exitStatus == 0
-			logging.debug('\u001B[1m Analyzing UE logfile ' + filename + ' \u001B[0m')
+			logging.debug(f'Analyzing UE logfile {filename}')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
 			if (logStatus < 0):
-				fullStatus = False
 				HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
+				self.exitStatus = 1
 			else:
 				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
 			for svcName in services:
-				filename = f'{svcName}-{HTML.testCase_id}.log'
-				logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
-				logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
-				if (logStatus < 0):
-					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
-					self.exitStatus = 1
+				if svcName == 'nv-cubb':
+					msg = 'Undeploy PNF/Nvidia CUBB'
+					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
+					filename = f'{svcName}-{HTML.testCase_id}.log'
+					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
+					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
+					if (logStatus < 0):
+						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'KO', logStatus)
+						self.exitStatus = 1
+					else:
+						HTML.CreateHtmlTestRow(RAN.runtime_stats, 'OK', CONST.ALL_PROCESSES_OK)
 			# all the xNB run logs shall be on the server 0 for logCollecting
 			if self.eNB_serverId[self.eNB_instance] != '0':
-				mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, f'./{files}.log', f'{self.eNBSourceCodePath}/cmake_targets/')
+				mySSH.copyout(f'./*.log', f'{lSourcePath}/cmake_targets/', recursive=True)
 		if self.exitStatus == 0:
 			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
+		mySSH.close()

 	def DeployGenObject(self, HTML, RAN, UE):
 		self.exitStatus = 0
@@ -1293,6 +1395,7 @@ class Containerize():
 					logStatus = UE.AnalyzeLogFile_UE(f'{logPath}/{filename}', HTML, RAN)
 					if (logStatus < 0):
 						fullStatus = False
+						self.exitStatus = 1
 						HTML.CreateHtmlTestRow('UE log Analysis', 'KO', logStatus)
 					else:
 						HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -437,13 +437,19 @@ class HTMLManagement():

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

--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -23,8 +23,8 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "eth0";
-    local_s_address = "192.168.71.140";
-    remote_s_address = "192.168.71.142";
+    local_s_address = "192.168.71.150";
+    remote_s_address = "192.168.71.171";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -51,9 +51,9 @@ gNBs =
    {

        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -16,7 +16,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 }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 }) });


    nr_cellid = 12345678L;
@@ -24,8 +24,8 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "lo";
-    local_s_address = "192.168.72.140";
-    remote_s_address = "192.168.72.143";
+    local_s_address = "192.168.71.150";
+    remote_s_address = "0.0.0.0"; # multiple DUs
    local_s_portc   = 501;
    local_s_portd   = 2152;
    remote_s_portc  = 500;
@@ -52,9 +52,9 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "192.168.72.140";
+        ipv4_cucp = "192.168.71.150";
        port_cucp = 38462;
-        ipv4_cuup = "192.168.72.141";
+        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
        port_cuup = 38462;
      }
    )
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -22,12 +22,12 @@ gNBs =
    tr_s_preference = "f1";

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

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

    NETWORK_INTERFACES :
    {
        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.141/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.141/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -171,7 +171,6 @@ MACRLCs = (
    remote_n_portd  = 2153;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
  }
 );

--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.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 }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 } ) });


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

    min_rxtxtime                                              = 6;
-    force_256qam_off = 1;

    servingCellConfigCommon = (
    {
@@ -170,8 +169,8 @@ MACRLCs = (
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_if_name = "eth0";
-    local_n_address = "192.168.71.142";
-    remote_n_address = "192.168.71.140";
+    local_n_address = "192.168.71.171";
+    remote_n_address = "192.168.71.150";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -178,7 +178,6 @@ MACRLCs = (
    remote_n_portd  = 2153;
    pusch_TargetSNRx10          = 200;
    pucch_TargetSNRx10          = 200;
-    ulsch_max_frame_inactivity = 1;
  }
 );

--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -0,0 +1,262 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+sa = 1;
+nfapi = "AERIAL";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 97;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                    }
+                  );
+                  });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts    = 2;
+    do_CSIRS              = 1;
+    do_SRS                = 0;
+    min_rxtxtime          = 2;
+
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+    );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
+      absoluteFrequencySSB                                          = 649920;
+      #652860; #should be 649920
+#647520;
+#647540;
+#649920;
+#650208;
+#647540;
+      dl_frequencyBand                                              = 78;
+      # this is 3300.24 MHz
+      dl_absoluteFrequencyPointA                                    = 646724;
+#649104;
+#646724;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                           = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                        = 1;
+        dl_carrierBandwidth                                         = 273;
+     #initialDownlinkBWP
+      #genericParameters
+       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
+       initialDLBWPlocationAndBandwidth                             = 1099;
+       #
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                               = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                          = 12;
+        initialDLBWPsearchSpaceZero                                 = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 273;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 1099;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 98
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 12;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 5;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         = -90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5; #6;
+      nrofDownlinkSlots                                             = 3; #7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 1; #2;
+      nrofUplinkSymbols                                             = 0;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno1";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eno";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+{
+  num_cc           = 1;
+  local_s_if_name  = "lo:";
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.2"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+  tr_s_preference             = "aerial";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200; # 150;
+  pucch_TargetSNRx10          = 200; #200;
+  ulsch_max_frame_inactivity  = 10;
+  dl_max_mcs = 28;
+  ul_max_mcs = 28;
+}
+);
+
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config :
+{
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="debug";
+  f1ap_log_level                        ="debug";
+};
--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
@@ -0,0 +1,242 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_GNB";
+
+    gNB_name  =  "gNB-Eurecom-5GNRBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  1;
+
+    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    pdsch_AntennaPorts_XP = 2;
+    pusch_AntennaPorts = 2;
+    min_rxtxtime = 6;
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                          = 621312;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 273;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=41,L=24 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                           = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPsearchSpaceZero                                             = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                                 = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 273;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 31624;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                           = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES : {
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
+        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = ({
+  num_cc = 1;
+  tr_s_preference = "local_L1";
+  tr_n_preference = "local_RRC";
+});
+
+L1s = ({
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+});
+
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 2
+  nb_rx          = 2
+  att_tx         = 0
+  att_rx         = 0;
+  bands          = [7];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain                    = 50;
+  eNB_instances  = [0];
+  bf_weights = [0x00007fff, 0x0000];
+  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
+});
+
+THREAD_STRUCT = ({
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+});
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+log_config : {
+  global_log_level = "info";
+  hw_log_level     = "info";
+  phy_log_level    = "info";
+  mac_log_level    = "info";
+  rlc_log_level    = "info";
+  pdcp_log_level   = "info";
+  rrc_log_level    = "info";
+};
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -200,7 +200,6 @@ MACRLCs = (
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
    pucch_TargetSNRx10  = 200;
-    ulsch_max_frame_inactivity = 0;
  }
 );

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

--- a/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf
@@ -1,41 +1,42 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

+sa = 1;
+
 gNBs =
 (
 {
    ////////// Identification parameters:
    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
+    gNB_name  =  "gNB-OAI";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    nr_cellid = 12345678L;

    tr_s_preference     = "local_mac"

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

+    sib1_tda                                                  = 15;
    min_rxtxtime                                              = 6;
 	
    servingCellConfigCommon = (
    {
 #spCellConfigCommon

-      physCellId                                                    = 0;
+      physCellId                                                    = 10;

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is pointA + 23 PRBs@120kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 2071241;
+      # this is pointA + 16 PRBs@120kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 2071387;
      dl_frequencyBand                                                 = 261;
      # this is 27.900 GHz
-      dl_absoluteFrequencyPointA                                       = 2070833;
+      dl_absoluteFrequencyPointA                                       = 2071001;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -50,7 +51,7 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 3;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPcontrolResourceSetZero                                      = 1;
        initialDLBWPsearchSpaceZero                                             = 0;

  #uplinkConfigCommon 
@@ -85,12 +86,12 @@ gNBs =
        powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 7;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 7;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
        ra_ContentionResolutionTimer                                = 7;
@@ -101,8 +102,7 @@ gNBs =
        prach_RootSequenceIndex                                     = 1;
        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
        #  
-        msg1_SubcarrierSpacing                                      = 3,
-
+        msg1_SubcarrierSpacing                                      = 3;
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
        restrictedSetConfig                                         = 0,
@@ -119,7 +119,7 @@ gNBs =
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
      ssb_PositionsInBurst_PR                                       = 3;
-      ssb_PositionsInBurst_Bitmap                                   = 0x0001000100010001L;
+      ssb_PositionsInBurst_Bitmap                                   = 1;

 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
@@ -152,7 +152,6 @@ gNBs =

  );

-
    # ------- SCTP definitions
    SCTP :
    {
@@ -162,91 +161,58 @@ gNBs =
    };


-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.18.99";
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
                            }
                          );

-    ///X2
-    enable_x2 = "no";
-    t_reloc_prep      = 1000;      /* unit: millisecond */
-    tx2_reloc_overall = 2000;      /* unit: millisecond */
-    t_dc_prep         = 1000;      /* unit: millisecond */
-    t_dc_overall      = 2000;      /* unit: millisecond */
-    target_enb_x2_ip_address      = (
-                                     { ipv4       = "192.168.18.199";
-                                       ipv6       = "192:168:30::17";
-                                       preference = "ipv4";
-                                     }
-                                    );
-
    NETWORK_INTERFACES :
    {
-
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.18.198/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.18.198/24";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.18.198/24";
-        GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
 );

-MACRLCs = (
-	{
-	    num_cc                      = 1;
-	    tr_s_preference             = "local_L1";
-	    tr_n_preference             = "local_RRC";
-	    pusch_TargetSNRx10          = 200;
-            pucch_TargetSNRx10          = 200;
-    }
-);
+MACRLCs = ({
+  num_cc                      = 1;
+  tr_s_preference             = "local_L1";
+  tr_n_preference             = "local_RRC";
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
+});

 L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+  prach_dtx_threshold   = 120;
+  #pucch0_dtx_threshold = 120;
 }
 );

-RUs = (
-    {		  
-       local_rf       = "yes"
-         nb_tx          = 1;
-         nb_rx          = 1;
-         att_tx         = 0;
-         att_rx         = 0;
-         bands          = [7];
-         sl_ahead       = 12;
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-	 sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-         if_freq = 5124520000L;
-	 clock_src = "external";
-	 time_src = "external";
-    }
-);  
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 1;
+  nb_rx          = 1;
+  att_tx         = 0;
+  att_rx         = 0;
+  sl_ahead       = 12;
+  bands          = [261];
+  max_pdschReferenceSignalPower = -27;
+  eNB_instances  = [0];
+});

 rfsimulator: {
    serveraddr = "server";
 };

-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
@@ -264,14 +230,6 @@ security = {
  drb_integrity = "no";
 };

-     log_config :
-     {
-       global_log_level                      ="info";
-       hw_log_level                          ="info";
-       phy_log_level                         ="info";
-       mac_log_level                         ="info";
-       rlc_log_level                         ="info";
-       pdcp_log_level                        ="info";
-       rrc_log_level                         ="info";
-    };
-
+log_config: {
+  global_log_level                      ="info";
+};
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -187,7 +187,6 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -197,8 +197,6 @@ MACRLCs = (
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 180;
  pucch_TargetSNRx10 = 200;
-  ulsch_max_frame_inactivity = 1;
-  ul_max_mcs = 16;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -188,7 +188,6 @@ MACRLCs = (
  tr_n_preference             = "local_RRC";
  #pusch_TargetSNRx10         = 150;
  #pucch_TargetSNRx10         = 200;
-  ulsch_max_frame_inactivity  = 0;
  dl_max_mcs                  = 16; # there are retransmissions if more
 }
 );
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -190,7 +190,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
    pucch_TargetSNRx10 = 200;
-     ulsch_max_frame_inactivity = 0;
  }
 );

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

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

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

--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -22,9 +22,9 @@ gNBs =

    ////////// Physical parameters:
    pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 1;
+    pusch_AntennaPorts                                        = 2;
    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
+    do_SRS                                                    = 1;

    servingCellConfigCommon = (
    {
@@ -192,8 +192,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
-    ulsch_max_frame_inactivity = 10;
-    ul_max_mcs         = 28;
  }
 );

--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -184,7 +184,6 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 0;
 }
 );

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

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

--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -186,7 +186,6 @@ MACRLCs = (
  pusch_TargetSNRx10          = 200;
  pucch_TargetSNRx10          = 200;
  ul_prbblack_SNR_threshold   = 10;
-  ulsch_max_frame_inactivity  = 0;
 }
 );

--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
@@ -0,0 +1,34 @@
+#this is a configuration file
+#used to build real time processing statistics 
+#for 5G NR phy test (gNB terminate)
+Title : Processing Time (us) from datalog_rt_stats.100.2x2.yaml
+ColNames :
+  - Metric
+  - Average; Max; Count
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+Ref : 
+  feprx : 150.0
+  feptx_prec : 0.0
+  feptx_ofdm : 65.0
+  feptx_total : 177.0
+  L1 Tx processing : 700.0
+  DLSCH encoding : 226.0
+  L1 Rx processing : 640.0
+  PUSCH inner-receiver : 400.0
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 15.0
+  UL Indication : 3.0
+  Slot Indication : 17.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.25
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.1x1.60.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref :
  feprx : 46.0
  feptx_prec : 15.0
  feptx_ofdm : 35.0
  feptx_total : 57.0
-  L1 Tx processing : 210.0
-  DLSCH encoding : 137.0
-  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 48.0
-  DL & UL scheduling timing : 13.0
-  UL Indication : 60.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  L1 Tx processing : 260.0
+  DLSCH encoding : 160.0
+  L1 Rx processing : 420.0
+  PUSCH inner-receiver : 170.0
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 8.0
+  UL Indication : 3.0
+  Slot Indication : 8.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.2x2.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 120.0
  feptx_prec : 30.0
@@ -15,18 +15,20 @@ Ref :
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
-  PUSCH decoding : 180.0 
-  DL & UL scheduling timing : 37.0
-  UL Indication : 38.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 11.0
+  UL Indication : 3.0
+  Slot Indication : 14.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.25
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.60.2x2.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 84.0
  feptx_prec : 14.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 111.0
-  DL & UL scheduling timing : 20.0
-  UL Indication : 127.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 48.0
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 3.0
+  Slot Indication : 15.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.35
+  UL Indication : 1.00
+  Slot Indication : 0.35
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -1,34 +1,34 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us)
+Title : Processing Time (us) from datalog_rt_stats.default.yaml
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
 Ref : 
  feprx : 43.0
  feptx_prec : 13.0
  feptx_ofdm : 33.0
  feptx_total : 55.0
-  L1 Tx processing : 170.0
-  DLSCH encoding : 118.0
-  L1 Rx processing : 305.0
+  L1 Tx processing : 220.0
+  DLSCH encoding : 130.0
+  L1 Rx processing : 387.0
  PUSCH inner-receiver : 150.0
-  PUSCH decoding : 2200.0
-  Schedule Response : 30.0
-  DL & UL scheduling timing : 10.0
-  UL Indication : 40.0
-Threshold :
-  feprx : 1.25
-  feptx_prec : 1.25
-  feptx_ofdm : 1.25
-  feptx_total : 1.25
-  L1 Tx processing : 1.25
-  DLSCH encoding : 1.25
-  L1 Rx processing : 1.25
-  PUSCH inner-receiver : 1.25
-  PUSCH decoding : 1.25
-  Schedule Response : 1.25
-  DL & UL scheduling timing : 1.25
-  UL Indication : 1.25
+  Schedule Response : 3.0
+  DL & UL scheduling timing : 6.0
+  UL Indication : 3.0
+  Slot Indication : 7.0
+DeviationThreshold :
+  feprx : 0.25
+  feptx_prec : 0.25
+  feptx_ofdm : 0.25
+  feptx_total : 0.25
+  L1 Tx processing : 0.25
+  DLSCH encoding : 0.25
+  L1 Rx processing : 0.25
+  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
+  DL & UL scheduling timing : 0.50
+  UL Indication : 1.00
+  Slot Indication : 0.50
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu20
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu20
@@ -0,0 +1,35 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Ubuntu 20.04
+#
+#---------------------------------------------------------------------
+
+FROM ran-base:develop as ran-tests
+
+RUN rm -Rf /oai-ran
+WORKDIR /oai-ran
+COPY . .
+
+WORKDIR /oai-ran/build
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -262,10 +262,12 @@ class EPCManagement():
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
+			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
 			if re.search('start-mini-as-ue', self.cfgDeploy):
 				dFile = 'docker-compose-mini-nrf-asue.yaml'
+			elif re.search('basic', self.cfgDeploy):\
+				dFile = 'docker-compose-basic-nrf.yaml'
 			else:
 				dFile = 'docker-compose-mini-nrf.yaml'
 			mySSH.command('docker-compose -f ' + dFile + ' ps -a', '\$', 60)
@@ -582,7 +584,7 @@ class EPCManagement():
 				mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)

 			logging.debug('Terminating OAI CN5G')
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.5/docker-compose', '\$', 5)
+			mySSH.command(f'cd {self.SourceCodePath}/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -65,6 +65,7 @@ import logging
 import datetime
 import signal
 import subprocess
+import traceback
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
@@ -102,7 +103,7 @@ def AssignParams(params_dict):


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

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


 			#real time statistics
@@ -1179,8 +1179,10 @@ class RANManagement():
 				self.datalog_rt_stats=datalog_rt_stats
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
-					if float(datalog_rt_stats['Data'][k][3])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
-						logging.debug('\u001B[1;30;43m datalog_rt_stats metric ' + k + '=' + datalog_rt_stats['Data'][k][3] + ' > threshold ' + str(datalog_rt_stats['Threshold'][k]) + ' \u001B[0m')
+					valnorm = float(datalog_rt_stats['Data'][k][3])
+					dev = datalog_rt_stats['DeviationThreshold'][k]
+					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
+						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
 						RealTimeProcessingIssue = True
 			else:
 				statMsg = 'No real time stats found in the log file\n'
--- a/ci-scripts/stats_monitor_conf.yaml
+++ b/ci-scripts/stats_monitor_conf.yaml
@@ -24,9 +24,9 @@ gnb :
    DLSCH encoding:
    L1 Rx processing:
    PUSCH inner-receiver:
-    PUSCH decoding:
    DL & UL scheduling timing:
    UL Indication:
+    Slot Indication:
  graph : 
    page1:
      dlsch_err:
@@ -44,6 +44,6 @@ gnb :
      rt.L1 Rx processing:
    page4:
      rt.PUSCH inner-receiver:
-      rt.PUSCH decoding:
      rt.DL & UL scheduling timing:
      rt.UL Indication:
+      rt.Slot Indication:
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -34,6 +34,7 @@
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
+  - Build_Run_Tests
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -27,14 +27,11 @@
        <TestCaseRequestedList>
 111111
 100021
- 000020
 000021
 000022
 000023
 000024
 020021
- 020022
- 030021
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -46,80 +43,44 @@
                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000020">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf</services>
+                <nb_healthy>4</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU-CP RF sim SA</desc>
+                <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cucp</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
+                <nb_healthy>11</nb_healthy>
        </testCase>

        <testCase id="000023">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU-UP and DU RF sim SA</desc>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cuup oai-du</services>
-                <nb_healthy>9</nb_healthy>
+                <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
+                <nb_healthy>14</nb_healthy>
        </testCase>

        <testCase id="000024">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>10</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <ping_args> -c 20 192.168.73.135</ping_args>
+                <desc>Ping ext-dn from all NR-UEs</desc>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <ping_args> -c 20 12.1.1.1 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping NR-UE from ext-dn</desc>
-                <id>rfsim5g_ext_dn</id>
-                <ping_args>-c 20 12.1.1.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="030021">
-                <class>IperfFromContainer</class>
-                <desc>Iperf UDP Downlink</desc>
-                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
-                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
-                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
-        </testCase>
-
-        <testCase id="030022">
-                <class>IperfFromContainer</class>
-                <desc>Iperf UDP Uplink</desc>
-                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
-                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
-                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.73.135 -u -i 1 -t 30 -b 1M</client_options>
-        </testCase>
-
        <testCase id="100021">
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down-e1</htmlTabRef>
-        <htmlTabName>CleanUp CUCP-CUUP-DU E1+F1 split</htmlTabName>
+        <htmlTabName>CleanUp E1+F1 split</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100022
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -27,13 +27,12 @@
        <TestCaseRequestedList>
 111111
 100021
- 000020
 000021
 000022
 000023
- 000024
- 000025
 020021
+ 030021
+ 030022
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -42,61 +41,35 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-        <testCase id="000020">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
+                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU RF sim SA</desc>
+                <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu</services>
-                <nb_healthy>7</nb_healthy>
+                <services>oai-cu oai-du oai-nr-ue</services>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="000023">
-                <class>DeployGenObject</class>
-                <desc>Deploy 3 OAI 5G DUs RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-du oai-du2 oai-du3</services>
-                <nb_healthy>10</nb_healthy>
-        </testCase>
-
-        <testCase id="000024">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-                <nb_healthy>12</nb_healthy>
-        </testCase>
-
-        <testCase id="000025">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-nr-ue3</services>
-                <nb_healthy>13</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
+                <id>rfsim5g_ue</id>
                <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -107,7 +80,7 @@
                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
        </testCase>

        <testCase id="030022">
@@ -116,7 +89,7 @@
                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
        </testCase>

        <testCase id="100021">
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100011
- 000010
 000011
 000012
 000013
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000010">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000011">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000012">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-gnb</services>
+                <services>oai-gnb oai-nr-ue</services>
                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000013">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020011">
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -60,8 +60,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -69,7 +69,7 @@
                <desc>Deploy OAI 5G gNB L2 sim SA</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -77,7 +77,7 @@
                <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>proxy oai-nr-ue0</services>
-                <nb_healthy>9</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="000004">
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -36,6 +35,7 @@
 000005
 000006
 000007
+ 000008
 020001
 020002
 020003
@@ -58,23 +58,15 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
-        </testCase>
-
-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
+                <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
        </testCase>

        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -82,7 +74,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -90,7 +82,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000004">
@@ -98,7 +90,7 @@
                <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue2</services>
-                <nb_healthy>9</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="000005">
@@ -106,7 +98,7 @@
                <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-                <nb_healthy>12</nb_healthy>
+                <nb_healthy>11</nb_healthy>
        </testCase>

        <testCase id="000006">
@@ -114,7 +106,7 @@
                <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-                <nb_healthy>15</nb_healthy>
+                <nb_healthy>14</nb_healthy>
        </testCase>

        <testCase id="000007">
@@ -122,7 +114,13 @@
                <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue9 oai-nr-ue10</services>
-                <nb_healthy>17</nb_healthy>
+                <nb_healthy>16</nb_healthy>
+        </testCase>
+
+        <testCase id="000008">
+                <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>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RFsim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-gnb</services>
+                <services>oai-gnb oai-nr-ue</services>
                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-gnb</services>
+                <services>oai-gnb oai-nr-ue</services>
                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -43,18 +43,16 @@

        <testCase id="000020">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI-DU</desc>
+                <desc>Deploy OAI-DU+nrUE</desc>
                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-du</services>
-                <nb_healthy>1</nb_healthy>
+                <services>oai-du oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
        </testCase>

        <testCase id="000021">
-                <class>DeployGenObject</class>
-                <desc>Deploy nrUE</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020021">
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -50,7 +50,7 @@
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config</command>
+            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
        </testCase>

        <testCase id="000010">
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -22,13 +22,12 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic FR2 do-ra gNB</htmlTabName>
+        <htmlTabName>Monolithic FR2 gNB</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 111111
 100001
- 004000
 000000
 000001
 020001
@@ -44,42 +43,35 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
-        </testCase>
-
        <testCase id="000000">
                <class>DeployGenObject</class>
                <desc>Deploy OAI gNB</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-gnb</services>
-                <nb_healthy>1</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI NR-UE</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>2</nb_healthy>
+                <services>oai-gnb oai-nr-ue</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
-                <desc>Ping gNB from NR-UE</desc>
+                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_args>-c 20 -i0.2 192.168.72.135</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

        <testCase id="020002">
                <class>Ping</class>
-                <desc>Ping NR-UE from gNB</desc>
-                <id>rfsim5g_gnb_nos1</id>
-                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

@@ -87,8 +79,8 @@
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
-                <d_retx_th>0,0,0,0</d_retx_th>
-                <u_retx_th>0,0,0,0</u_retx_th>
+                <d_retx_th>10,0,0,0</d_retx_th>
+                <u_retx_th>10,0,0,0</u_retx_th>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
@@ -26,7 +26,6 @@
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
- 004000
 222222
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -37,13 +36,6 @@
                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
        </testCase>

-	<testCase id="004000">
-            <class>Custom_Command</class>
-            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_fr2_32prb_rrc.config</command>
-        </testCase>
-
        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <desc>Clean Test Images on Test Server</desc>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -48,7 +48,7 @@
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
            <node>localhost</node>
-            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
+            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
        </testCase>

        <testCase id="000000">
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -28,7 +28,6 @@
        <TestCaseRequestedList>
 111111
 100001
- 000000
 000001
 000002
 000003
@@ -47,36 +46,26 @@
                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

-        <testCase id="000000">
-                <class>DeployGenObject</class>
-                <desc>Deploy MySql Database</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>mysql</services>
-                <nb_healthy>1</nb_healthy>
-        </testCase>
-
        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
-                <nb_healthy>6</nb_healthy>
+                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <nb_healthy>5</nb_healthy>
        </testCase>

        <testCase id="000002">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <desc>Deploy OAI 5G gNB+nrUE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-gnb</services>
+                <services>oai-gnb oai-nr-ue</services>
                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
-                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <class>Attach_UE</class>
+                <desc>Attach OAI UE (Wait for IP)</desc>
+                <id>rfsim5g_ue</id>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_build_run_tests.xml
+++ b/ci-scripts/xml_files/container_build_run_tests.xml
@@ -0,0 +1,40 @@
+<!--
+
+ 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-run-test-tab</htmlTabRef>
+	<htmlTabName>Build and Run Unit Tests</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030201">
+		<class>Build_Run_Tests</class>
+		<desc>Build and Run UnitTests</desc>
+		<kind>all</kind>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -30,7 +30,7 @@

 111111
 100000
-010000
+010010
 030101
 010001
 000001
@@ -39,7 +39,6 @@
 070000
 070001
 010010
-010002
 030201

 </TestCaseRequestedList>
@@ -80,28 +79,16 @@
    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
  </testCase>

-  <testCase id="010000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
  <testCase id="010001">
    <class>Attach_UE</class>
    <desc>Attach UE</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
  </testCase>

  <testCase id="050000">
    <class>Ping</class>
    <desc>Ping: 20 pings</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -110,8 +97,8 @@
 <testCase id="050001">
    <class>Ping</class>
    <desc>Ping: 100 pings, size 1024</desc>
-    <id>nrmodule2_quectel</id>
-    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
+    <id>up2</id>
+    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
@@ -121,7 +108,7 @@
    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
    <iperf_args>-u -b 26M -t 60</iperf_args>
    <direction>DL</direction>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    <iperf_profile>single-ue</iperf_profile>
@@ -132,7 +119,7 @@
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
     <direction>UL</direction>
-     <id>nrmodule2_quectel</id>
+     <id>up2</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -141,7 +128,7 @@
  <testCase id="010010">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
  </testCase>

  <testCase id="030201">
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -30,7 +30,7 @@

 111111
 100000
-010000
+010010
 030101
 010001
 000001
@@ -39,7 +39,6 @@
 070000
 070001
 010010
-010002
 030201

 </TestCaseRequestedList>
@@ -80,28 +79,16 @@
    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
  </testCase>

-  <testCase id="010000">
-    <class>Initialize_UE</class>
-    <desc>Initialize Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
-  <testCase id="010002">
-    <class>Terminate_UE</class>
-    <desc>Terminate Quectel</desc>
-    <id>nrmodule2_quectel</id>
-  </testCase>
-
  <testCase id="010001">
    <class>Attach_UE</class>
    <desc>Attach UE</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
  </testCase>

  <testCase id="050000">
    <class>Ping</class>
    <desc>Ping: 20 pings</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -110,8 +97,8 @@
 <testCase id="050001">
    <class>Ping</class>
    <desc>Ping: 100 pings, size 1024</desc>
-    <id>nrmodule2_quectel</id>
-    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
+    <id>up2</id>
+    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
@@ -121,7 +108,7 @@
    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
    <iperf_args>-u -b 1M -t 60</iperf_args>
    <direction>DL</direction>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    <iperf_profile>single-ue</iperf_profile>
@@ -132,7 +119,7 @@
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
     <direction>UL</direction>
-     <id>nrmodule2_quectel</id>
+     <id>up2</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -141,7 +128,7 @@
  <testCase id="010010">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>nrmodule2_quectel</id>
+    <id>up2</id>
  </testCase>

  <testCase id="030201">
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -185,8 +185,8 @@

 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 70M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_nsa_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_terminate.xml
@@ -26,6 +26,8 @@
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
+ 010001
+ 010002
 030202
 030201
 222220
@@ -33,6 +35,17 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>

+    <testCase id= "010001">
+      <class>Detach_UE</class>
+      <desc>Detach UE</desc>
+      <id>idefix</id>
+    </testCase>
+    <testCase id="010002">
+      <class>Terminate_UE</class>
+      <desc>Terminate Quectel</desc>
+      <id>idefix</id>
+    </testCase>
+
    <testCase id="030201">
        <class>Undeploy_Object</class>
        <desc>Undeploy eNB</desc>
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -0,0 +1,139 @@
+<!--
+
+ 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</htmlTabRef>
+        <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+                111111
+                000222
+                001111
+                002222
+                002223
+                000111
+                100000
+                000011
+                000022
+                000033
+                000222
+                003333
+                222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb-aerial</images_to_pull>
+        </testCase>
+
+        <testCase id="001111">
+                <class>Initialize_UE</class>
+                <desc>Initialize Quectel</desc>
+                <id>sphex_quectel</id>
+        </testCase>
+
+        <testCase id="002222">
+                <class>Deploy_Object</class>
+                <desc>Deploy PNF/Nvidia CUBB in a container</desc>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
+                <services>nv-cubb</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="002223">
+                <class>Deploy_Object</class>
+                <desc>Deploy VNF in a container</desc>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
+                <services>oai-gnb-aerial</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
+        <testCase id="000111">
+                <class>Attach_UE</class>
+                <desc>Attach Quectel</desc>
+                <id>sphex_quectel</id>
+        </testCase>
+
+        <testCase id="100000">
+                <class>Custom_Command</class>
+                <desc>Adding a IP route</desc>
+                <node>sphex</node>
+                <command>sudo ip route add 192.168.71.128/26 via 12.1.1.151 dev wwan0</command>
+        </testCase>
+
+        <testCase id="000011">
+                <class>Ping</class>
+                <desc>Ping: 100pings in 20sec</desc>
+                <id>sphex_quectel</id>
+                <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="000022">
+                <class>Iperf</class>
+                <desc>iperf (DL/UDP/80M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 80M -t 30 -R</iperf_args>
+                <direction>IPERF3</direction>
+                <id>sphex_quectel</id>
+                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="000033">
+                <class>Iperf</class>
+                <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 40M -t 30</iperf_args>
+                <direction>IPERF3</direction>
+                <id>sphex_quectel</id>
+                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+        </testCase>
+
+        <testCase id="000222">
+                <class>Detach_UE</class>
+                <desc>Detach Quectel</desc>
+                <id>sphex_quectel</id>
+        </testCase>
+
+        <testCase id="003333">
+                <class>Terminate_UE</class>
+                <desc>Terminate Quectel</desc>
+                <id>sphex_quectel</id>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Undeploy_Object</class>
+                <desc>Undeploy gNB</desc>
+                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+                <d_retx_th>20,100,100,100</d_retx_th>
+                <u_retx_th>20,100,100,100</u_retx_th>
+        </testCase>
+</testCaseList>
+
--- a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml
@@ -0,0 +1,52 @@
+<!--
+
+ 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-cleanup</htmlTabRef>
+  <htmlTabName>CleanUp AERIAL</htmlTabName>
+  <htmlTabIcon>trash</htmlTabIcon>
+  <TestCaseRequestedList>
+    111111
+    222222
+    333333
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="111111">
+    <class>Clean_Test_Server_Images</class>
+    <desc>Clean Test Images on Test Server</desc>
+    <test_svr_id>0</test_svr_id>
+  </testCase>
+
+  <testCase id="222222">
+    <class>Detach_UE</class>
+    <desc>Terminate UE</desc>
+    <id>sphex_quectel</id>
+  </testCase>
+
+  <testCase id="333333">
+    <class>Terminate_UE</class>
+    <desc>Terminate UE</desc>
+    <id>sphex_quectel</id>
+  </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -40,9 +40,15 @@
    002008
    002009
    002010
+    002011
+    002012
+    002013
+    002014
+    002015
    000100
    000010
    000020
+    002016
    000200
    003000
    004000
@@ -132,12 +138,42 @@
    <id>amarisoft_ue_10</id>
  </testCase>

+  <testCase id="002011">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_11</id>
+  </testCase>
+
+  <testCase id="002012">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_12</id>
+  </testCase>
+
+  <testCase id="002013">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_13</id>
+  </testCase>
+
+  <testCase id="002014">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_14</id>
+  </testCase>
+
+  <testCase id="002015">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_15</id>
+  </testCase>
+
  <testCase id="000010">
    <class>Iperf</class>
    <desc>iperf (DL/7Mbps/UDP)(30 sec)(multi-ue profile)</desc>
    <iperf_args>-u -b 70M -t 30 -i 1 -R</iperf_args>
    <direction>IPERF3</direction>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 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>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
    <iperf_profile>balanced</iperf_profile>
@@ -145,10 +181,10 @@

  <testCase id="000020">
    <class>Iperf</class>
-    <desc>iperf (UL/2Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 20M -t 30 -i 1 </iperf_args>
+    <desc>iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 36M -t 30 -i 1 </iperf_args>
    <direction>IPERF3</direction>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 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>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
    <iperf_profile>balanced</iperf_profile>
@@ -157,17 +193,23 @@
  <testCase id="000100">
    <class>Ping</class>
    <desc>Ping: 20pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 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>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>25</ping_rttavg_threshold>
  </testCase>

+  <testCase id="002016">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_16</id>
+  </testCase>
+
  <testCase id="000200">
    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec, multi-ue</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
-    <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
+    <desc>Ping: 50pings in 10sec, multi-ue</desc>
+    <id>amarisoft_ue_16</id>
+    <ping_args>-c 50 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>30</ping_rttavg_threshold>
  </testCase>
@@ -175,7 +217,7 @@
  <testCase id="003000">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
+    <id>amarisoft_ue_1 amarisoft_ue_2 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 amarisoft_ue_16</id>
  </testCase>

  <testCase id="004000">
--- a/ci-scripts/xml_files/container_sa_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  030201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>
--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -37,6 +37,10 @@
    370001
    370000
    370002
+    360001
+    100002
+    360002
+    350000
    310011
    310002
    330201
@@ -114,9 +118,9 @@

  <testCase id="350000">
    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
+    <desc>Ping: 50pings in 10sec</desc>
    <id>idefix</id>
-    <ping_args>-c 20 %cn_ip%</ping_args>
+    <ping_args>-c 20 -i 0.2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>25</ping_rttavg_threshold>
  </testCase>
@@ -152,6 +156,27 @@
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

+  <testCase id="360001">
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment (on DU)</desc>
+    <node>ofqot</node>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+  <testCase id="360002">
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment (on CU)</desc>
+    <node>ofqot</node>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase id="100002">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
  <testCase id="330201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-DU</desc>
--- a/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_terminate.xml
@@ -26,11 +26,24 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  330201
  222222
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="330201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-CP/CU-UP/DU</desc>
--- a/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  230201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="230201">
    <class>Undeploy_Object</class>
    <desc>Undeploy CU-DU</desc>
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -129,8 +129,8 @@

  <testCase id="270000">
    <class>Iperf</class>
-    <desc>iperf (DL/100Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 100M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
    <direction>DL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_terminate.xml
@@ -26,10 +26,23 @@
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
+  010001
+  010002
  030201
  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>

+  <testCase id= "010001">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>idefix</id>
+  </testCase>
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>idefix</id>
+  </testCase>
+
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>
--- a/ci-scripts/xml_files/fr1_cn5g_basic_deploy.xml
+++ b/ci-scripts/xml_files/fr1_cn5g_basic_deploy.xml
@@ -0,0 +1,45 @@
+<!--
+
+ 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>cn5g-start-tab</htmlTabRef>
+        <htmlTabName>CN5G-Start</htmlTabName>
+        <htmlTabIcon>log-in</htmlTabIcon>
+        <TestCaseRequestedList>
+                000100
+                000200
+        </TestCaseRequestedList>
+        <TestCaseExclusionList>
+        </TestCaseExclusionList>
+
+        <testCase id="000100">
+                <class>Terminate_5GCN</class>
+                <desc>Terminate 5G Core</desc>
+                <args>--type stop-basic</args>
+        </testCase>
+
+        <testCase id="000200">
+                <class>Initialize_5GCN</class>
+                <desc>Initialize 5G Core</desc>
+                <args>--type start-basic</args>
+        </testCase>
+</testCaseList>
--- a/ci-scripts/xml_files/fr1_cn5g_basic_undeploy.xml
+++ b/ci-scripts/xml_files/fr1_cn5g_basic_undeploy.xml
@@ -0,0 +1,39 @@
+<!--
+
+ 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>cn5g-start-tab</htmlTabRef>
+        <htmlTabName>CN5G-Start</htmlTabName>
+        <htmlTabIcon>log-in</htmlTabIcon>
+        <TestCaseRequestedList>
+                000300
+        </TestCaseRequestedList>
+        <TestCaseExclusionList>
+        </TestCaseExclusionList>
+
+        <testCase id="000300">
+                <class>Terminate_5GCN</class>
+                <desc>Terminate 5G Core</desc>
+                <args>--type stop-basic</args>
+        </testCase>
+</testCaseList>
+
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
@@ -0,0 +1,68 @@
+<!--
+
+ 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>gNB-PHY-Test-100-2x2</htmlTabRef>
+  <htmlTabName>Timing phytest 100 MHz 2x2</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+100000 390101 000001 390109 200000
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+  <testCase id="100000">
+	  <class>Custom_Command</class>
+	  <desc>Disable Sleep States</desc>
+	  <node>caracal</node>
+	  <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+  <testCase id="200000">
+	  <class>Custom_Command</class>
+	  <desc>Enable Sleep States</desc>
+	  <node>caracal</node>
+	  <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase id="390101">
+    <class>Initialize_eNB</class>
+    <desc>Initialize gNB USRP</desc>
+    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 273 -t 23 -D 130175 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+    <rt_stats_cfg>datalog_rt_stats.100.2x2.yaml</rt_stats_cfg>
+    <air_interface>NR</air_interface>
+    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>
+		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
+  </testCase>
+
+  <testCase id="000001">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+  </testCase>
+
+
+  <testCase id="390109">
+    <class>Terminate_eNB</class>
+    <desc>Terminate gNB</desc>
+    <air_interface>NR</air_interface>
+  </testCase>
+
+</testCaseList>
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/amf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/amf-healthcheck.sh
@@ -1,57 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-AMF_PORT_FOR_NGAP=38412
-AMF_PORT_FOR_N11_HTTP=80
-AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
-AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
-N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
-N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: configuration file is not configured properly"
-fi
-
-if [[ -z $N2_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
-fi
-
-if [[ -z $N11_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
-fi
-
-#host="${MYSQL_SERVER}"
-#user="${MYSQL_USER:-root}"
-#export MYSQL_PWD="${MYSQL_PASS}"
-
-#args=(
-#	-h"$host"
-#	-u"$user"
-#	--silent
-#)
-
-#if ! command -v mysql &> /dev/null; then
-#	echo "Installing mysql command"
-#	apt update
-#	apt-get -y install mysql-client
-#else
-#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
-#		if [[ -z $database_check ]]; then
-#			echo "Healthcheck error: oai_db not populated"
-#			STATUS=1
-#		fi
-#		STATUS=0
-#	else
-#		echo "Healthcheck error: Mysql port inactive"
-#		STATUS=1
-#	fi
-#fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -1,20 +1,11 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
        volumes:
-            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
        environment:
            - TZ=Europe/Paris
            - MYSQL_DATABASE=oai_db
@@ -31,108 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
            - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -145,6 +64,7 @@ services:
                ipv4_address: 192.168.71.134
            traffic_net:
                ipv4_address: 192.168.72.134
+
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
@@ -153,7 +73,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -162,18 +82,19 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
+
    oai-cu:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-cu
        environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-ext-dn
        networks:
            public_net:
-                ipv4_address: 192.168.71.140
+                ipv4_address: 192.168.71.150
        volumes:
          - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -181,56 +102,19 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
+
    oai-du:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-du
-        environment: 
+        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-cu
        networks:
            public_net:
-                ipv4_address: 192.168.71.142
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-du2:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.143
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-du3:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cu
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.144
+                ipv4_address: 192.168.71.171
        volumes:
            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -238,56 +122,21 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
+
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+                                    -r 106 --numerology 1 -C 3619200000
+                                    --uicc0.imsi 208990100001100
+                                    --rfsimulator.serveraddr 192.168.71.171
        depends_on:
            - oai-du
        networks:
            public_net:
-                ipv4_address: 192.168.71.150
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du2
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.151
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du3
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.152
+                ipv4_address: 192.168.71.181
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -307,7 +156,7 @@ networks:
            com.docker.network.bridge.name: "rfsim5g-public"
    traffic_net:
        driver: bridge
-        name: rfsim5g-oai-traffic_net-net
+        name: rfsim5g-oai-traffic-net
        ipam:
            config:
                - subnet: 192.168.72.128/26
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/mysql-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/mysql-healthcheck.sh
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
-	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
-	exit 0
-fi
-
-host="$(hostname --ip-address || echo '127.0.0.1')"
-user="${MYSQL_USER:-root}"
-export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
-
-args=(
-	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
-	-h"$host"
-	-u"$user"
-	--silent
-)
-
-STATUS=0
-if command -v mysqladmin &> /dev/null; then
-	if mysqladmin "${args[@]}" ping > /dev/null; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-else
-	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-fi
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/nrf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/nrf-healthcheck.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $NRF_SBI_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/smf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/smf-healthcheck.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
-
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-#if [ $NB_UNREPLACED_AT -ne 0 ]; then
-#	STATUS=-1
-#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-#fi
-#
-if [[ -z $SMF_SBI_PORT_STATUS ]]; then
-	STATUS=-1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/spgwu-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/spgwu-healthcheck.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SGW_PORT_FOR_S1U_S12_S4_UP=2152
-SGW_PORT_FOR_SX=8805
-SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
-SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
-S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
-SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
-fi
-
-if [[ -z $SX_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
@@ -1,57 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-AMF_PORT_FOR_NGAP=38412
-AMF_PORT_FOR_N11_HTTP=80
-AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
-AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
-N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
-N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: configuration file is not configured properly"
-fi
-
-if [[ -z $N2_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
-fi
-
-if [[ -z $N11_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
-fi
-
-#host="${MYSQL_SERVER}"
-#user="${MYSQL_USER:-root}"
-#export MYSQL_PWD="${MYSQL_PASS}"
-
-#args=(
-#	-h"$host"
-#	-u"$user"
-#	--silent
-#)
-
-#if ! command -v mysql &> /dev/null; then
-#	echo "Installing mysql command"
-#	apt update
-#	apt-get -y install mysql-client
-#else
-#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
-#		if [[ -z $database_check ]]; then
-#			echo "Healthcheck error: oai_db not populated"
-#			STATUS=1
-#		fi
-#		STATUS=0
-#	else
-#		echo "Healthcheck error: Mysql port inactive"
-#		STATUS=1
-#	fi
-#fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -1,20 +1,11 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
        volumes:
-            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
        environment:
            - TZ=Europe/Paris
            - MYSQL_DATABASE=oai_db
@@ -31,108 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
            - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -153,7 +72,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -166,7 +85,7 @@ services:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-gnb
-        environment: 
+        environment:
            USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
@@ -187,7 +106,6 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment: 
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
-	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
-	exit 0
-fi
-
-host="$(hostname --ip-address || echo '127.0.0.1')"
-user="${MYSQL_USER:-root}"
-export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
-
-args=(
-	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
-	-h"$host"
-	-u"$user"
-	--silent
-)
-
-STATUS=0
-if command -v mysqladmin &> /dev/null; then
-	if mysqladmin "${args[@]}" ping > /dev/null; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-else
-	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
-		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
-		if [[ -z $database_check ]]; then
-			echo "Healthcheck error: oai_db not populated"
-			STATUS=1
-		fi
-		STATUS=0
-	else
-		echo "Healthcheck error: Mysql port inactive"
-		STATUS=1
-	fi
-fi
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $NRF_SBI_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
-SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
-
-#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
-#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-
-#if [ $NB_UNREPLACED_AT -ne 0 ]; then
-#	STATUS=-1
-#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-#fi
-#
-if [[ -z $SMF_SBI_PORT_STATUS ]]; then
-	STATUS=-1
-	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-STATUS=0
-SGW_PORT_FOR_S1U_S12_S4_UP=2152
-SGW_PORT_FOR_SX=8805
-SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
-SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
-S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
-SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
-#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
-NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
-if [ $NB_UNREPLACED_AT -ne 0 ]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
-fi
-
-if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
-fi
-
-if [[ -z $SX_PORT_STATUS ]]; then
-	STATUS=1
-	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
-fi
-
-exit $STATUS
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
@@ -96,10 +96,9 @@ Now pull images.

 ```bash
 docker pull mysql:8.0
-docker pull oaisoftwarealliance/oai-amf:v1.5.0
-docker pull oaisoftwarealliance/oai-nrf:v1.5.0
-docker pull oaisoftwarealliance/oai-smf:v1.5.0
-docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+docker pull oaisoftwarealliance/oai-amf:v2.0.0
+docker pull oaisoftwarealliance/oai-smf:v2.0.0
+docker pull oaisoftwarealliance/oai-upf:v2.0.0
 docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 docker pull oaisoftwarealliance/oai-gnb:develop
@@ -139,14 +138,13 @@ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up

 ```bash
 cd ci-scripts/yaml_files/5g_l2sim_tdd
-docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
+docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
 ```
 ```bash
 Creating network "l2sim-oai-public-net" with driver "bridge"
 Creating network "l2sim-oai-traffic_net-net" with driver "bridge"
-Creating l2sim-oai-nrf ... done
 Creating l2sim-mysql      ... done
-Creating l2sim-oai-spgwu ... done
+Creating l2sim-oai-upf   ... done
 Creating l2sim-oai-amf   ... done
 Creating l2sim-oai-smf   ... done
 Creating l2sim-oai-ext-dn ... done
@@ -160,12 +158,11 @@ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```

 At this point, you can prepare a capture on the newly-created public docker bridges:
@@ -206,8 +203,7 @@ sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135
 docker-compose up -d oai-gnb
 ```
 ```bash
-l2sim-oai-nrf is up-to-date
-l2sim-oai-spgwu is up-to-date
+l2sim-oai-upf is up-to-date
 l2sim-oai-ext-dn is up-to-date
 Creating l2sim-oai-gnb ... done
 ```
@@ -220,13 +216,12 @@ $ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```

 You can verify that the `gNB` is connected with the `AMF`:
@@ -250,10 +245,9 @@ docker-compose up -d proxy oai-nr-ue
 ```
 ```bash
 l2sim-mysql is up-to-date
-l2sim-oai-nrf is up-to-date
 l2sim-oai-amf is up-to-date
 l2sim-oai-smf is up-to-date
-l2sim-oai-spgwu is up-to-date
+l2sim-oai-upf is up-to-date
 l2sim-oai-ext-dn is up-to-date
 l2sim-oai-gnb is up-to-date
 Creating l2sim-oai-nr-ue ... done
@@ -268,18 +262,17 @@ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
-l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
-l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)                               
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
+l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)
 ```
 ```bash
-docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-nrf l2sim-oai-smf l2sim-oai-spgwu l2sim-proxy
+docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-smf l2sim-oai-upf l2sim-proxy
 ```
 ```bash
 CONTAINER          CPU %     MEM USAGE / LIMIT     MEM %
@@ -288,9 +281,8 @@ l2sim-oai-amf      4.05%     29.49MiB / 62.54GiB   0.05%
 l2sim-oai-ext-dn   0.00%     31.27MiB / 62.54GiB   0.05%
 l2sim-oai-gnb      1.29%     1.853GiB / 62.54GiB   2.96%
 l2sim-oai-nr-ue0   1.43%     350.8MiB / 62.54GiB   0.55%
-l2sim-oai-nrf      0.21%     9.105MiB / 62.54GiB   0.01%
 l2sim-oai-smf      3.24%     30.23MiB / 62.54GiB   0.05%
-l2sim-oai-spgwu    0.00%     11.78MiB / 62.54GiB   0.02%
+l2sim-oai-upf      0.00%     11.78MiB / 62.54GiB   0.02%
 l2sim-proxy        6.97%     290.4MiB / 62.54GiB   0.45%
 ```

@@ -389,19 +381,17 @@ Stopping l2sim-oai-nr-ue2 ... done
 Stopping l2sim-oai-nr-ue  ... done
 Stopping l2sim-oai-gnb    ... done
 Stopping l2sim-oai-ext-dn ... done
-Stopping l2sim-oai-spgwu  ... done
+Stopping l2sim-oai-upf    ... done
 Stopping l2sim-oai-smf    ... done
 Stopping l2sim-oai-amf    ... done
-Stopping l2sim-oai-nrf    ... done
 Stopping l2sim-mysql      ... done
 Removing l2sim-oai-nr-ue2 ... done
 Removing l2sim-oai-nr-ue  ... done
 Removing l2sim-oai-gnb    ... done
 Removing l2sim-oai-ext-dn ... done
-Removing l2sim-oai-spgwu  ... done
+Removing l2sim-oai-upf    ... done
 Removing l2sim-oai-smf    ... done
 Removing l2sim-oai-amf    ... done
-Removing l2sim-oai-nrf    ... done
 Removing l2sim-mysql      ... done
 Removing network l2sim-oai-public-net
 Removing network l2sim-oai-traffic-net
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "l2sim-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "l2sim-mysql"
        image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "l2sim-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
            - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "l2sim-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "l2sim-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "l2sim-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -153,7 +72,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -172,7 +91,7 @@ services:
            USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
-            - oai-spgwu
+            - oai-upf
            - oai-amf
        volumes:
            - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf
--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -37,10 +37,9 @@ Now pull images.

 ```bash
 $ docker pull mysql:8.0
-$ docker pull oaisoftwarealliance/oai-amf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-smf:v1.5.0
-$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+$ docker pull oaisoftwarealliance/oai-amf:v2.0.0
+$ docker pull oaisoftwarealliance/oai-smf:v2.0.0
+$ docker pull oaisoftwarealliance/oai-upf:v2.0.0
 $ docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 $ docker pull oaisoftwarealliance/oai-gnb:develop
@@ -53,7 +52,7 @@ $ docker logout

 **CAUTION: 2023/01/27 with the release `v1.5.0` of the `CN5G`, the previous version was not compatible any-more.**

-**This new version is working only with the `v1.5.0` of the `CN5G`.**
+**This new version is working only with the `v2.0.0` of the `CN5G`.**

 # 2. Deploy containers #

@@ -65,18 +64,18 @@ $ docker logout

 All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_rfsimulator` folder for a deployment with monolithic gNB.

-For a deployment with the gNB split in CU and DU components, the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_f1_rfsimulator` folder. 
+For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.
+For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the `../5g_rfsimulator_e1` folder.

 ## 2.1. Deploy OAI 5G Core Network ##

 ```bash
 $ cd ci-scripts/yaml_files/5g_rfsimulator
-$ docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
+$ docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
 Creating network "rfsim5g-oai-public-net" with driver "bridge"
 Creating network "rfsim5g-oai-traffic_net-net" with driver "bridge"
-Creating rfsim5g-oai-nrf ... done
 Creating rfsim5g-mysql      ... done
-Creating rfsim5g-oai-spgwu ... done
+Creating rfsim5g-oai-upf   ... done
 Creating rfsim5g-oai-amf   ... done
 Creating rfsim5g-oai-smf   ... done
 Creating rfsim5g-oai-ext-dn ... done
@@ -86,20 +85,19 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```

 At this point, you can prepare a capture on the newly-created public docker bridges:

 ```bash
-$ ifconfig 
+$ ifconfig
 ...
 rfsim5g-public: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.129  netmask 255.255.255.192  broadcast 192.168.71.191
@@ -130,8 +128,7 @@ The gNB can be deployed either in monolithic mode, or in CU/DU split mode.

 ```bash
 $ docker-compose up -d oai-gnb
-rfsim5g-oai-nrf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 Creating rfsim5g-oai-gnb ... done
 ```
@@ -149,15 +146,14 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```

 You can verify that the `gNB` is connected with the `AMF`:
@@ -177,10 +173,9 @@ $ docker logs rfsim5g-oai-amf
 ```bash
 $ docker-compose up -d oai-nr-ue
 rfsim5g-mysql is up-to-date
-rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue ... done
@@ -190,23 +185,22 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
-rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
+rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
+rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
 ```

 Making sure the OAI UE is connected:

 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.150  netmask 255.255.255.192  broadcast 192.168.71.191
        ether 02:42:c0:a8:47:89  txqueuelen 0  (Ethernet)
@@ -265,10 +259,9 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
 ```bash
 $ docker-compose up -d oai-nr-ue2
 rfsim5g-mysql is up-to-date
-rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-spgwu is up-to-date
+rfsim5g-oai-upf is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue2 ... done
@@ -278,7 +271,7 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports            
+       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
 rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
@@ -286,16 +279,15 @@ rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
 rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
 rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
 rfsim5g-oai-nr-ue2   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
-rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp
 rfsim5g-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
 ```

 Making sure the Second OAI UE is connected:

 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue2 /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.151  netmask 255.255.255.192  broadcast 192.168.71.191
        ether 02:42:c0:a8:47:8a  txqueuelen 0  (Ethernet)
@@ -457,19 +449,17 @@ Stopping rfsim5g-oai-nr-ue2 ... done
 Stopping rfsim5g-oai-nr-ue  ... done
 Stopping rfsim5g-oai-gnb    ... done
 Stopping rfsim5g-oai-ext-dn ... done
-Stopping rfsim5g-oai-spgwu  ... done
+Stopping rfsim5g-oai-upf    ... done
 Stopping rfsim5g-oai-smf    ... done
 Stopping rfsim5g-oai-amf    ... done
-Stopping rfsim5g-oai-nrf    ... done
 Stopping rfsim5g-mysql      ... done
 Removing rfsim5g-oai-nr-ue2 ... done
 Removing rfsim5g-oai-nr-ue  ... done
 Removing rfsim5g-oai-gnb    ... done
 Removing rfsim5g-oai-ext-dn ... done
-Removing rfsim5g-oai-spgwu  ... done
+Removing rfsim5g-oai-upf    ... done
 Removing rfsim5g-oai-smf    ... done
 Removing rfsim5g-oai-amf    ... done
-Removing rfsim5g-oai-nrf    ... done
 Removing rfsim5g-mysql      ... done
 Removing network rfsim5g-oai-public-net
 Removing network rfsim5g-oai-traffic-net
@@ -521,24 +511,21 @@ docker-compose entry mount another config, or add `--uicc0.imsi
 feature of the configuration module to overwrite any configuration option in
 the config file on the command line.

-We are also using a dedicated `oai-smf.conf` for the `SMF` container: the `oai` DNN shall match the one in  the NR-UE section of `docker-compose.yaml` (`DNN: oai`).
-
 ## 5.2. Making the gNB connect to the core network ##

-Mainly you need to match the PLMN in `gNB`, `AMF` and `SPGWU` parameters:
+Mainly you need to match the PLMN in `gNB`, `AMF` and `UPF` parameters in the `mini_nonrf_config.yaml`:

-* `AMF`
-  - `MCC=208`
-  - `MNC=99`
-  - `PLMN_SUPPORT_TAC=0x0001`
-  - ...
-* `SPGWU`
-  - `MCC=208`
-  - `MNC=99`
-  - `TAC=1`
-* `gNB`
-  - `MCC: '208'`
-  - `MNC: '99'`
-  - `TAC: 1`
+```yaml
+  plmn_support_list:
+    - mcc: 208
+      mnc: 99
+      tac: 0x0001
+      nssai:
+        - *embb_slice1
+...
+snssais:
+  - &embb_slice1
+    sst: 1
+```

 The `ST` and `SD` values shall also match.
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
            - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ./mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -153,7 +72,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -187,7 +106,6 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -206,7 +124,6 @@ services:
        container_name: rfsim5g-oai-nr-ue2
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -225,7 +142,6 @@ services:
        container_name: rfsim5g-oai-nr-ue3
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -244,7 +160,6 @@ services:
        container_name: rfsim5g-oai-nr-ue4
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -263,7 +178,6 @@ services:
        container_name: rfsim5g-oai-nr-ue5
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -282,7 +196,6 @@ services:
        container_name: rfsim5g-oai-nr-ue6
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -301,7 +214,6 @@ services:
        container_name: rfsim5g-oai-nr-ue7
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -320,7 +232,6 @@ services:
        container_name: rfsim5g-oai-nr-ue8
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -339,7 +250,6 @@ services:
        container_name: rfsim5g-oai-nr-ue9
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -358,7 +268,6 @@ services:
        container_name: rfsim5g-oai-nr-ue10
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml
@@ -0,0 +1,189 @@
+################################################################################
+# 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
+################################################################################
+
+# OAI CN Configuration File
+### This file can be used by all OAI NFs
+### Some fields are specific to an NF and will be ignored by other NFs
+
+## NOTE ON YAML ANCHORS ##
+# We use YAML anchors to ease the configuration and to avoid duplicating parts of the configuration.
+# This is especially true for the SNSSAIs, as we have to define them for multiple NFs.
+# Please note that the use of anchors is not mandatory, and you can define the SNSSAI in each NF yourself.
+# You can read more about anchors here: https://yaml.org/spec/1.2.2/#anchors-and-aliases
+
+############# Common configuration
+
+# Log level for all the NFs
+log_level:
+  general: debug
+
+# If you enable registration, the other NFs will use the NRF discovery mechanism
+register_nf:
+  general: no
+
+http_version: 1
+
+############## SBI Interfaces
+### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
+nfs:
+  amf:
+    host: oai-amf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n2:
+      interface_name: eth0
+      port: 38412
+  smf:
+    host: oai-smf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n4:
+      interface_name: eth0
+      port: 8805
+
+  upf:
+    host: oai-upf
+    sbi:
+      port: 80
+      api_version: v1
+      interface_name: eth0
+    n3:
+      interface_name: eth0
+      port: 2152
+    n4:
+      interface_name: eth0
+      port: 8805
+    n6:
+      interface_name: eth1
+    n9:
+      interface_name: eth0
+      port: 2152
+
+#### Common for UDR and AMF
+database:
+  host: mysql
+  user: test
+  type: mysql
+  password: test
+  database_name: oai_db
+  generate_random: true
+  connection_timeout: 300 # seconds
+
+## general single_nssai configuration
+## Defines YAML anchors, which are reused in the config file
+snssais:
+  - &embb_slice1
+    sst: 1
+
+############## NF-specific configuration
+amf:
+  amf_name: "OAI-AMF"
+  # This really depends on if we want to keep the "mini" version or not
+  support_features_options:
+    enable_simple_scenario: yes # "no" by default with the normal deployment scenarios with AMF/SMF/UPF/AUSF/UDM/UDR/NRF.
+                               # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
+                               # There's no NRF in this scenario, SMF info is taken from "nfs" section.
+    enable_nssf: no
+    enable_smf_selection: no
+  relative_capacity: 30
+  statistics_timer_interval: 20  # in seconds
+  emergency_support: false
+  served_guami_list:
+    - mcc: 208
+      mnc: 99
+      amf_region_id: 01
+      amf_set_id: 001
+      amf_pointer: 01
+  plmn_support_list:
+    - mcc: 208
+      mnc: 99
+      tac: 0x0001
+      nssai:
+        - *embb_slice1
+  supported_integrity_algorithms:
+    - "NIA0"
+    - "NIA1"
+    - "NIA2"
+  supported_encryption_algorithms:
+    - "NEA0"
+    - "NEA1"
+    - "NEA2"
+
+smf:
+  ue_mtu: 1500
+  support_features:
+    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
+  upfs:
+    - host: oai-upf
+      port: 8805
+      config:
+        enable_usage_reporting: no
+        # follows UPFInfo from 3GPP TS 29.510, currently only these values from interfaceUpfInfoList are supported
+      upf_info:
+        interfaceUpfInfoList:
+          - interfaceType: "N3"
+            networkInstance: "access.oai.org"
+          - interfaceType: "N6"
+            networkInstance: "core.oai.org"
+  ue_dns:
+    primary_ipv4: "172.21.3.100"
+    primary_ipv6: "2001:4860:4860::8888"
+    secondary_ipv4: "8.8.8.8"
+    secondary_ipv6: "2001:4860:4860::8888"
+  ims:
+    pcscf_ipv4: "127.0.0.1"
+    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
+  # the DNN you configure here should be configured in "dnns"
+  # follows the SmfInfo datatype from 3GPP TS 29.510
+  smf_info:
+    sNssaiSmfInfoList:
+      - sNssai: *embb_slice1
+        dnnSmfInfoList:
+          - dnn: "oai"
+  local_subscription_infos:
+    - single_nssai: *embb_slice1
+      dnn: "oai"
+      qos_profile:
+        5qi: 9
+        session_ambr_ul: "200Mbps"
+        session_ambr_dl: "400Mbps"
+
+upf:
+  support_features:
+    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
+    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
+  upf_info:
+    sNssaiUpfInfoList:
+      - sNssai: *embb_slice1
+        dnnUpfInfoList:
+          - dnn: "oai"
+
+## DNN configuration
+dnns:
+  - dnn: "oai"
+    pdu_session_type: "IPV4"
+    ipv4_subnet: "12.1.1.0/24"
--- a/ci-scripts/yaml_files/5g_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -1,14 +1,5 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/Paris
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -31,108 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
            - TZ=Europe/paris
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Only one slice is defined (1, 0xFFFFFF).
-            - SST_0=1
-            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
-            - AMF_INTERFACE_NAME_FOR_N11=eth0
-            # One single SMF instance
-            - SMF_INSTANCE_ID_0=1
-            - SMF_FQDN_0=oai-smf
-            - SMF_IPV4_ADDR_0=192.168.71.133
-            - SELECTED_0=true
-            # mysql definition in AMF is mandatory in mini deployment.
-            - MYSQL_SERVER=192.168.71.131
-            - MYSQL_USER=root
-            - MYSQL_PASS=linux
-            - MYSQL_DB=oai_db
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - REGISTER_NRF=yes
-            - DISCOVER_UPF=yes
-            - USE_FQDN_DNS=yes
-            - USE_LOCAL_SUBSCRIPTION_INFO=yes
-            - UE_MTU=1500
-            # Only one slice is defined (1, 0xFFFFFF)
-            - DNN_NI0=oai
-            - TYPE0=IPv4
-            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
-            - NSSAI_SST0=1
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
            - TZ=Europe/Paris
-            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
-            - SGW_INTERFACE_NAME_FOR_SX=eth0
-            - PGW_INTERFACE_NAME_FOR_SGI=eth0
-            - NETWORK_UE_NAT_OPTION=yes
-            - NETWORK_UE_IP=12.1.1.0/24
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Only one slice is defined (1, 0xFFFFFF)
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
+        volumes:
+            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -153,7 +72,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -187,7 +106,6 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/Show More
+++ b/Show More