fix tutorial: use "docker-compose", not "docker compose"

Merge branch 'integration_2023_w16b' into 'develop'
integration_2023_w16b See merge request oai/openairinterface5g!2069 * !1952 Fix problems detected by UBsan * !1924 NR UL 256 QAM * !1988 PUCCH2 for N = 64 * !2053 separating MAC and PHY procedures for TA * !2058 fix interoperability with accelleran CU * !2060 avoid duplicated function in nr_common for supported bandwidth * !2064 CI AW2S config file fix * !2065 bugfix for msg3 retransmission scheduling frame * !2067 Modification of tagging develop images on OC
2026-07-16 22:20:31 +00:00 · 2023-04-30 16:34:41 +02:00 · 2023-04-24 06:05:11 +00:00 · 2023-04-22 07:51:37 +02:00 · 2023-04-22 07:51:29 +02:00 · 2023-04-22 07:51:22 +02:00
707 changed files with 47741 additions and 34582 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -9,9 +9,10 @@ AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowAllArgumentsOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -44,7 +45,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakStringLiterals: true
-ColumnLimit:     200
+ColumnLimit:     132
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,12 +37,6 @@ include("cmake_targets/macros.cmake")
 ###################################
 include(FindPkgConfig)

-pkg_search_module(LIBXML2 libxml-2.0 REQUIRED)
-include_directories(${LIBXML2_INCLUDE_DIRS})
-
-pkg_search_module(LIBXSLT libxslt REQUIRED)
-include_directories(${LIBXSLT_INCLUDE_DIRS})
-
 pkg_search_module(OPENSSL openssl REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIRS})

@@ -195,12 +189,17 @@ elseif(${CPUARCH} NOT STREQUAL "x86_64")
  message(FATAL_ERROR "Cannot compile for CPU architecture ${CPUARCH}")
 endif()

-set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -fno-var-tracking-assignments -march=native")
+set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=native")

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

-set(commonOpts "-pipe -Wno-packed-bitfield-compat -fPIC -Wall -fno-strict-aliasing -rdynamic")
+set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing")
+# GNU C/C++ Compiler might throw many warnings without packed-bitfield-compat, see man page
+# also, we need -rdynamic to incorporate all symbols in shared objects, again, see man page
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat -rdynamic")
+endif()

 set(CMAKE_C_FLAGS
  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops")
@@ -289,7 +288,6 @@ add_definitions("-DFIRMWARE_VERSION=\"${FIRMWARE_VERSION}\"")
 add_definitions("-DPACKAGE_VERSION=\"Branch: ${GIT_BRANCH} Abrev. Hash: ${GIT_COMMIT_HASH} Date: ${GIT_COMMIT_DATE}\"")
 add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")

-
 # Debug related options
 #########################################
 add_boolean_option(DEBUG_ASN1      False "ASN1 coder/decoder Debug" OFF)
@@ -301,7 +299,7 @@ add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)

 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
-target_link_libraries(ITTI PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 # asn1c skeletons have hardcoded this flag to make customized debug logs
 # OAI uses this feature to re-use OAI LOG_I(ASN, ...)
@@ -348,7 +346,7 @@ add_library(s1ap
  ${S1AP_DIR}/s1ap_eNB_ue_context.c
  )
 target_link_libraries(s1ap PUBLIC asn1_s1ap)
-target_link_libraries(s1ap PRIVATE nr_rrc asn1_nr_rrc lte_rrc)
+target_link_libraries(s1ap PRIVATE nr_rrc asn1_nr_rrc_hdrs lte_rrc)

 # NGAP
 ##############
@@ -368,8 +366,8 @@ add_library(ngap
  ${NGAP_DIR}/ngap_gNB_trace.c
  ${NGAP_DIR}/ngap_gNB_ue_context.c
  )
-target_link_libraries(ngap PUBLIC asn1_ngap lte_rrc)
-target_link_libraries(ngap PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(ngap PUBLIC asn1_ngap)
+target_link_libraries(ngap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 #M2AP
 ##############
@@ -417,7 +415,7 @@ add_library(m3ap
 )
 target_link_libraries(m3ap PUBLIC asn1_m3ap)
 target_link_libraries(m3ap PRIVATE m2ap)
-target_link_libraries(m3ap PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(m3ap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 target_include_directories(m3ap PUBLIC "${M3AP_DIR}")

 #X2AP
@@ -437,7 +435,7 @@ add_library(x2ap
  ${X2AP_DIR}/x2ap_timers.c
 )
 target_link_libraries(x2ap PUBLIC asn1_x2ap)
-target_link_libraries(x2ap PRIVATE nr_rrc lte_rrc)
+target_link_libraries(x2ap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)


 # F1AP
@@ -448,7 +446,6 @@ add_library(f1ap
            ${F1AP_DIR}/f1ap_cu_interface_management.c
            ${F1AP_DIR}/f1ap_cu_paging.c
            ${F1AP_DIR}/f1ap_cu_rrc_message_transfer.c
-            ${F1AP_DIR}/f1ap_cu_system_information.c
            ${F1AP_DIR}/f1ap_cu_task.c
            ${F1AP_DIR}/f1ap_cu_ue_context_management.c
            ${F1AP_DIR}/f1ap_cu_warning_message_transmission.c
@@ -566,7 +563,6 @@ set_target_properties(benetel_4g PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -
 SET(DPDK_LIBS "-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive")
 target_link_libraries(benetel_4g PRIVATE ${DPDK_LIBS})
 target_link_libraries(benetel_4g PRIVATE pthread dl rt m numa)
-target_link_libraries(benetel_4g PRIVATE asn1_nr_rrc asn1_lte_rrc)

 # Benetel 5G library
 ######################################################################
@@ -585,7 +581,6 @@ set_target_properties(benetel_5g PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -
 SET(DPDK_LIBS "-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive")
 target_link_libraries(benetel_5g PRIVATE ${DPDK_LIBS})
 target_link_libraries(benetel_5g PRIVATE pthread dl rt m numa)
-target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)

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

@@ -655,11 +650,6 @@ add_boolean_option(NAS_BUILT_IN_UE         True  "UE NAS layer present in this e
 add_boolean_option(NAS_UE                  True  "NAS UE INSTANCE (<> NAS_MME)" ON)


-##########################
-# ACCESS STRATUM LAYER2 OPTIONS
-##########################
-add_boolean_option(JUMBO_FRAME             True  "ENABLE LARGE SDU in ACCESS STRATUM (larger than common MTU)" ON)
-
 ##########################
 # PDCP LAYER OPTIONS
 ##########################
@@ -752,7 +742,6 @@ include_directories("${OPENAIR2_DIR}/UTIL/OSA")
 include_directories("${OPENAIR2_DIR}/UTIL/MEM")
 include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
 include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
-include_directories("${OPENAIR2_DIR}/UTIL/OCG")
 include_directories("${OPENAIR2_DIR}/UTIL/MATH")
 include_directories("${OPENAIR2_DIR}/UTIL/TIMER")
 include_directories("${OPENAIR2_DIR}/UTIL/OMG")
@@ -783,7 +772,6 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/time_meas.c
  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-target_link_libraries(UTIL PRIVATE asn1_nr_rrc asn1_lte_rrc)

 set(SECU_OSA_SRC
  ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
@@ -822,7 +810,7 @@ set(SCHED_SRC
  ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})
-target_link_libraries(SCHED_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
@@ -831,7 +819,7 @@ set(SCHED_NR_SRC
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
-target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs)

 set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -839,7 +827,7 @@ set(SCHED_SRC_RU
  ${OPENAIR1_DIR}/SCHED/prach_procedures.c
 )
 add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
-target_link_libraries(SCHED_RU_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
@@ -849,7 +837,7 @@ set(SCHED_SRC_UE
  ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-target_link_libraries(SCHED_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -859,7 +847,7 @@ set(SCHED_SRC_NR_UE
  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
 )
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
-target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)


 # nFAPI
@@ -889,7 +877,7 @@ set(NFAPI_PNF_SRC
  ${NFAPI_DIR}/pnf/src/pnf_p7_interface.c
 )
 add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
-target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 include_directories(${NFAPI_DIR}/pnf/public_inc)
 include_directories(${NFAPI_DIR}/pnf/inc)
@@ -901,7 +889,7 @@ set(NFAPI_VNF_SRC
  ${NFAPI_DIR}/vnf/src/vnf_p7_interface.c
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
-target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
@@ -915,7 +903,7 @@ set(NFAPI_USER_SRC
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 include_directories(${NFAPI_USER_DIR})

 # Layer 1
@@ -1017,7 +1005,6 @@ add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
 target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)

 add_library(coding MODULE ${PHY_TURBOSRC} )
-target_link_libraries(coding PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )

@@ -1274,27 +1261,23 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp
 set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)

 add_library(PHY_COMMON ${PHY_SRC_COMMON})
-target_link_libraries(PHY_COMMON PRIVATE lte_rrc)
 add_dependencies(PHY_COMMON dfts)
-target_link_libraries(PHY_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)

 add_library(PHY ${PHY_SRC})
-target_link_libraries(PHY PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(PHY_UE ${PHY_SRC_UE})
-target_link_libraries(PHY_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
-target_link_libraries(PHY_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)

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

 #Library for mex functions
 #########################3
@@ -1318,7 +1301,7 @@ set(PHY_MEX_UE
  ${OPENAIR_DIR}/common/utils/T/local_tracer.c
  )
 add_library(PHY_MEX ${PHY_MEX_UE} ${CONFIG_LIB})
-target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc)
+target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs)

 #Layer 2 library
 #####################
@@ -1496,6 +1479,7 @@ set (MAC_SRC

 set (MAC_NR_SRC
  ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
+  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
  ${NR_GNB_MAC_DIR}/main.c
  ${NR_GNB_MAC_DIR}/config.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1534,6 +1518,7 @@ set (MAC_NR_SRC_UE
  ${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
+  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
 )

 set (ENB_APP_SRC
@@ -1559,14 +1544,12 @@ set (MISC_NFAPI_LTE
 )

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

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

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

 add_library(L2
  ${L2_SRC}
@@ -1575,16 +1558,16 @@ add_library(L2
  ${MCE_APP_SRC}
  )
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
-target_link_libraries(L2 PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(MAC_NR ${MAC_NR_SRC})
-target_link_libraries(MAC_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(L2_LTE ${L2_LTE_SRC})
-target_link_libraries(L2_LTE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(L2_NR
  ${L2_NR_SRC}
@@ -1597,13 +1580,13 @@ add_library(e1_if
  ${NR_RRC_DIR}/cucp_cuup_e1ap.c
  )

-target_link_libraries(e1_if PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap e1ap GTPV1U)
+target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap e1ap GTPV1U)

 add_library(e1_pdcp_if
  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
  )

-target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(e1_pdcp_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap)

@@ -1620,29 +1603,29 @@ add_library(L2_UE
  ${L2_SRC_UE}
  ${MAC_SRC_UE}
 )
-target_link_libraries(L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(L2_UE_LTE_NR
  ${L2_RRC_SRC_UE}
  ${MAC_SRC_UE}
 )
-target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 if (NOT ${NOS1})
 target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
 endif()

-target_link_libraries(L2_UE PRIVATE lte_rrc)
+target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)

 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 target_link_libraries(NR_L2_UE PRIVATE f1ap)
-target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(MAC_NR_COMMON
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c
 )
-target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MAC_NR_COMMON PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 include_directories("${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE")
 include_directories("${OPENAIR2_DIR}/LAYER2")
@@ -1660,7 +1643,7 @@ add_library (GTPV1U
  ${RRC_DIR}/rrc_eNB_GTPV1U.c
  ${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
  )
-target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(GTPV1U PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(GTPV1U PRIVATE SIMU)
 include_directories(${OPENAIR3_DIR}/ocp-gtp)

@@ -1670,7 +1653,7 @@ set (MME_APP_SRC
 )
 add_library(MME_APP ${MME_APP_SRC})
 target_link_libraries(MME_APP PRIVATE m2ap m3ap)
-target_link_libraries(MME_APP PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(MME_APP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 set(SCTP_SRC
  ${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -1678,7 +1661,7 @@ set(SCTP_SRC
  ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c
 )
 add_library(SCTP_CLIENT ${SCTP_SRC})
-target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
 set(libnas_api_OBJS
@@ -1919,6 +1902,7 @@ set(libnrnas_emm_msg_OBJS
  ${NAS_SRC}COMMON/EMM/MSG/FGSUplinkNasTransport.c
  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishRequest.c
  ${NAS_SRC}COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
+  ${NAS_SRC}COMMON/EMM/MSG/FGSDeregistrationRequestUEOriginating.c
  )

 set(libnrnas_ies_OBJS
@@ -1960,7 +1944,7 @@ target_link_libraries(LIB_NAS_SIMUE PRIVATE lte_rrc)


 set(NAS_SIM_LIB LIB_NAS_SIMUE)
-target_link_libraries(LIB_NAS_SIMUE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_NAS_SIMUE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(LIB_NAS_UE
  ${NAS_SRC}UE/nas_itti_messaging.c
@@ -1981,9 +1965,8 @@ add_library(LIB_NAS_UE
  $<TARGET_OBJECTS:ds>
  )
 target_include_directories(LIB_NAS_UE PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
-target_link_libraries(LIB_NAS_UE PRIVATE lte_rrc)
 set(NAS_UE_LIB LIB_NAS_UE)
-target_link_libraries(LIB_NAS_UE PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_NAS_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 include_directories(${NAS_SRC}NR_UE)
 include_directories(${NAS_SRC}UE)
@@ -2015,7 +1998,7 @@ add_library(LIB_5GNAS_GNB

 target_include_directories(LIB_5GNAS_GNB PRIVATE ${OPENAIR_DIR}/common/utils/ds/)
 target_link_libraries(LIB_5GNAS_GNB PRIVATE SECU_CN ${CRYPTO_LIBRARIES})
-target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(LIB_5GNAS_GNB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 # Simulation library
 ##########################
@@ -2034,28 +2017,28 @@ set (SIMUSRC
 )
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
-target_link_libraries(SIMU PRIVATE asn1_nr_rrc asn1_lte_rrc)

 # Qt-based scope
 add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
 if (ENABLE_NRQTSCOPE)
  find_package(Qt5 REQUIRED COMPONENTS Widgets Charts)
  message ("Qt5 Widgets and Charts found for nrqtscope")
-  set(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp)
+  set(QTSCOPE_SOURCE_NR
+    ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp
+    ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c)
  # Creates rules for calling the Meta-Object Compiler (moc) on the given source files
  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
-  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc asn1_lte_rrc)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 endif()

-add_library(SIMU_ETH
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
-${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
-#${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/emu_transport.c
+add_library(SIMU_ETH STATIC
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
 )
+target_link_libraries(SIMU_ETH PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
@@ -2073,7 +2056,6 @@ add_library(rfsimulator MODULE
  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
 	)
 target_link_libraries(rfsimulator PRIVATE SIMU ${ATLAS_LIBRARIES})
-target_link_libraries(rfsimulator PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_library(oai_iqplayer MODULE
 	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
@@ -2166,9 +2148,6 @@ add_executable(lte-softmodem
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -2183,13 +2162,12 @@ target_link_libraries(lte-softmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU
+  ${NAS_UE_LIB} ITTI SIMU SIMU_ETH
  -Wl,--end-group z dl)

-target_link_libraries(lte-softmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp)
 target_link_libraries(lte-softmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)


 add_executable(oairu
@@ -2211,7 +2189,7 @@ target_link_libraries(oairu PRIVATE
  -Wl,--end-group z dl)

 target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
-target_link_libraries(oairu PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(oairu PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-softmodem PRIVATE
@@ -2230,9 +2208,6 @@ add_executable(lte-uesoftmodem
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
@@ -2248,14 +2223,13 @@ target_link_libraries(lte-uesoftmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap x2ap m2ap m3ap
  SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
  ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
  -Wl,--end-group z dl)

-target_link_libraries(lte-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-uesoftmodem PRIVATE
@@ -2277,7 +2251,6 @@ add_executable(nr-softmodem
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
@@ -2291,14 +2264,13 @@ 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 SECU_CN SECU_OSA
  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
  x2ap f1ap m2ap m3ap e1ap
  -Wl,--end-group z dl)

-target_link_libraries(nr-softmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${ATLAS_LIBRARIES})
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)

@@ -2313,7 +2285,6 @@ target_link_libraries(nr-softmodem PRIVATE
 add_executable(nr-cuup
  executables/nr-cuup.c
  executables/softmodem-common.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
@@ -2325,9 +2296,9 @@ add_executable(nr-cuup

 target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap e1_pdcp_if f1ap
+                      GTPV1U e1ap e1_pdcp_if f1ap SIMU_ETH
                      SECU_OSA SECU_CN ${OPENSSL_LIBRARIES} crypt z sctp dl pthread)
-target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc asn1_nr_rrc)
+target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
                      
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2344,7 +2315,6 @@ add_executable(nr-uesoftmodem
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
@@ -2357,13 +2327,12 @@ target_link_libraries(nr-uesoftmodem PRIVATE
  nr_rrc SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
  NFAPI_USER_LIB MISC_NFAPI_NR_LIB
-  ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU
+  ITTI ${ATLAS_LIBRARIES} LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH
  -Wl,--end-group z dl)

-target_link_libraries(nr-uesoftmodem PRIVATE ${LIBXML2_LIBRARIES})
 target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${ATLAS_LIBRARIES})
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
-target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
 if (ENABLE_LDPC_CUDA)
@@ -2402,7 +2371,7 @@ add_executable(rftest
  ${SHLIB_LOADER_SOURCES}
 )
 target_link_libraries(rftest PRIVATE minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL pthread dl m ${T_LIB} )
-target_link_libraries(rftest PRIVATE asn1_lte_rrc asn1_nr_rrc)
+target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_executable(polartest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
@@ -2414,7 +2383,6 @@ target_link_libraries(polartest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_COMMON PHY_NR_UE CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
  )
-target_link_libraries(polartest PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_executable(smallblocktest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c
@@ -2427,7 +2395,6 @@ target_link_libraries(smallblocktest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
 )
-target_link_libraries(smallblocktest PRIVATE asn1_nr_rrc asn1_lte_rrc)


 add_executable(ldpctest
@@ -2445,12 +2412,11 @@ target_link_libraries(ldpctest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON CONFIG_LIB -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} dl
  )
-target_link_libraries(ldpctest PRIVATE asn1_nr_rrc asn1_lte_rrc)

 add_executable(nr_dlschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
  )
@@ -2458,10 +2424,11 @@ target_link_libraries(nr_dlschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
  )
-target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)

 add_executable(nr_pbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
@@ -2470,14 +2437,14 @@ target_link_libraries(nr_pbchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)


 #PUCCH ---> Prashanth
 add_executable(nr_pucchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
  )
@@ -2485,45 +2452,42 @@ target_link_libraries(nr_pucchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

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

 add_executable(nr_prachsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${NR_UE_RRC_DIR}/rrc_nsa.c
-  ${NFAPI_USER_DIR}/nfapi.c
-  ${PHY_INTERFACE_DIR}/queue_t.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES})
 target_link_libraries(nr_prachsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl)
-target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_ulschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
@@ -2532,16 +2496,17 @@ target_link_libraries(nr_ulschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
 )
-target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
@@ -2552,10 +2517,10 @@ if (ENABLE_LDPC_T1)
 endif()

 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECU_CN ngap -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
  )
-target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

@@ -2572,7 +2537,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
    -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_NR_COMMON PHY PHY_UE PHY_RU ITTI -Wl,--end-group
    pthread m rt CONFIG_LIB ${ATLAS_LIBRARIES} ${T_LIB} dl
    )
-  target_link_libraries(${myExe} PRIVATE asn1_nr_rrc asn1_lte_rrc)
+  target_link_libraries(${myExe} PRIVATE asn1_lte_rrc_hdrs)

 endforeach(myExe)

--- a/README.md
+++ b/README.md
@@ -4,8 +4,12 @@

 <p align="center">
    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
-    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS"></a>
-    <a href="https://www.redhat.com/en/enterprise-linux-8"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
+    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
+    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>

 <p align="center">
@@ -13,10 +17,10 @@
 </p>

 <p align="center">
-  <a href="https://hub.docker.com/r/rdefosseoai/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-enb?label=eNB%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/rdefosseoai/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/rdefosseoai/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-gnb?label=gNB%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/rdefosseoai/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/rdefosseoai/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-gnb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-gnb?label=gNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
+  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
 </p>

 # OpenAirInterface License #
@@ -32,12 +36,12 @@ Please see [NOTICE](NOTICE.md) file for third party software that is included in

 # Where to Start #

+ *  [General overview of documentation](./doc/README.md)
 *  [The implemented features](./doc/FEATURE_SET.md)
 *  [How to build](./doc/BUILD.md)
 *  [How to run the modems](./doc/RUNMODEM.md)

-More information and documentation can be found in the [doc folder](./doc).
-Unfortunately, not all information is available there, and information for
+Not all information is available in a central place, and information for
 specific sub-systems might be available in the corresponding sub-directories.
 To find all READMEs, this command might be handy:

@@ -51,52 +55,20 @@ The OpenAirInterface (OAI) software is composed of the following parts:

 ```
 openairinterface5g
+├── charts
 ├── ci-scripts        : Meta-scripts used by the OSA CI process. Contains also configuration files used day-to-day by CI.
+├── CMakeLists.txt    : Top-level CMakeLists.txt for building
 ├── cmake_targets     : Build utilities to compile (simulation, emulation and real-time platforms), and generated build files.
-├── common            : Some common OAI utilities, other tools can be found at openair2/UTILS.
-├── doc               : Contains an up-to-date feature set list and starting tutorials.
-├── executables       : Top-level executable source files.
-├── LICENSE           : License file.
+├── common            : Some common OAI utilities, some other tools can be found at openair2/UTILS.
+├── doc               : Documentation
+├── docker            : Dockerfiles to build for Ubuntu and RHEL
+├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
-├── nfapi             : Contains the NFAPI code. A local Readme file provides more details.
+├── nfapi             : (n)FAPI code for MAC-PHY interface
 ├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
-│   ├── PHY
-│   ├── SCHED
-│   ├── SCHED_NBIOT
-│   ├── SCHED_NR
-│   ├── SCHED_NR_UE
-│   ├── SCHED_UE
-│   └── SIMULATION    : PHY RF simulation.
 ├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
-│   ├── COMMON
-│   ├── DOCS
-│   ├── ENB_APP
-│   ├── F1AP
-│   ├── GNB_APP
-│   ├── LAYER2/RLC/   : with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0.
-│   ├── LAYER2/PDCP/PDCP_v10.1.0
-│   ├── M2AP
-│   ├── MCE_APP
-│   ├── NETWORK_DRIVER
-│   ├── NR_PHY_INTERFACE
-│   ├── NR_UE_PHY_INTERFACE
-│   ├── PHY_INTERFACE
-│   ├── RRC
-│   ├── UTIL
-│   └── X2AP
 ├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-│   ├── COMMON
-│   ├── DOCS
-│   ├── GTPV1-U
-│   ├── M3AP
-│   ├── MME_APP
-│   ├── NAS
-│   ├── S1AP
-│   ├── SCTP
-│   ├── SECU
-│   ├── TEST
-│   ├── UDP
-│   └── UTILS
-├── radio             : drivers for various radios such as USRP, AW2S, RFsim, ...
-└── targets           : Top-level wrappers for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
+├── openshift         : OpenShift helm charts for some deployment options of OAI
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
+└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -385,6 +385,47 @@ pipeline {
            }
          }
        }
+        stage ("LTE-TDD-2x2-Container") {
+          when { expression {do4Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-LTE-TDD-2x2-Container', 'LTE-TDD-2x2-Container')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-LTE-TDD-2x2-Container')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
+        stage ("SA-AW2S-CN5G") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-SA-AW2S-CN5G', 'SA-AW2S-CN5G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-SA-AW2S-CN5G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
+
        //avra is offline, re-enable once it is available
        //stage ("T1-Offload-Test") {
        //  when { expression {do5Gtest} }
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -211,10 +211,16 @@ pipeline {
        script {
          dir ('ci-scripts') {
            // Zipping all archived log files
-            sh "zip -r -qq physim_deploytest_logs_${env.BUILD_ID}.zip physim_test_logs_*/*"
-            sh "rm -rf physim_test_logs_*/"
-            if (fileExists("physim_deploytest_logs_${env.BUILD_ID}.zip")) {
-              archiveArtifacts artifacts: "physim_deploytest_logs_${env.BUILD_ID}.zip"
+              sh "mkdir test_logs"
+              sh "mv *.log* test_logs || true"
+              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
+              sh "rm -rf *test_log*/"
+              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
+                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
+              }
+              if (fileExists("test_logs_CN.zip")){
+                sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip"
+                archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip"
            }
            if (fileExists("test_results.html")) {
              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -24,7 +24,6 @@

 // Location of the python executor node shall be in the same subnet as the others servers
 def pythonExecutor = params.pythonExecutor
-def DataBaseHost = params.DataBaseHost

 // Location of the test XML file to be run
 def testXMLFile = params.pythonTestXmlFile
@@ -169,10 +168,6 @@ pipeline {
            allParametersPresent = false
          }

-          if (params.DataBaseHost == "none") {
-            DataBaseHost = pythonExecutor
-          }
-
          if (allParametersPresent) {
            echo "All parameters are present"
            if (eNB_AllowMergeRequestProcess) {
@@ -357,18 +352,6 @@ pipeline {
            }
          }
        }
-        stage ("SQL Collect"){
-          when {
-            expression { params.DataBaseHost != "none" }
-          }
-          agent {label DataBaseHost}
-          steps {
-            script {
-              if (currentBuild.result=='FAILURE') {StatusForDb = 'FAIL'} else {StatusForDb = 'PASS'}
-              sh "python3 /home/oaicicd/mysql/sql_connect.py ${JOB_NAME} ${params.eNB_MR} ${params.eNB_Branch} ${env.BUILD_ID} ${env.BUILD_URL} ${StatusForDb} ''"
-            }
-          }
-        }
      }
    }
  }
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -197,6 +197,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
                SCA.eNBSourceCodePath=matchReg.group(1)
                PHYSIM.eNBSourceCodePath=matchReg.group(1)
                CLUSTER.eNBSourceCodePath=matchReg.group(1)
+                EPC.eNBSourceCodePath=matchReg.group(1)
            elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1SourceCodePath=matchReg.group(1)
@@ -219,10 +220,10 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            EPC.SourceCodePath=matchReg.group(1)
        elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
-            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE):
+            if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE) or re.match('OC-OAI-CN5G', matchReg.group(1), re.IGNORECASE):
                EPC.Type=matchReg.group(1)
            else:
-                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker)')
+                sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker or OC-OAI-CN5G)')
        elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
            EPC.ContainerPrefix=matchReg.group(1)
@@ -260,14 +261,17 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUST
            matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCUserName = matchReg.group(1)
            CLUSTER.OCUserName = matchReg.group(1)
+            EPC.OCUserName = matchReg.group(1)
        elif re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCPassword=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCPassword = matchReg.group(1)
            CLUSTER.OCPassword = matchReg.group(1)
+            EPC.OCPassword = matchReg.group(1)
        elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCProjectName = matchReg.group(1)
            CLUSTER.OCProjectName = matchReg.group(1)
+            EPC.OCProjectName = matchReg.group(1)
        elif re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
            CLUSTER.OCUrl = matchReg.group(1)
--- a/ci-scripts/as_ue/aw2s-asue.cfg
+++ b/ci-scripts/as_ue/aw2s-asue.cfg
@@ -0,0 +1,183 @@
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 1
+#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/ue1.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,
+#if TDD == 1
+      band: 78,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
+#else
+      band: 7,
+      dl_nr_arfcn: 536020,
+      ssb_nr_arfcn: 535930,
+      ssb_subcarrier_spacing: 15,
+#endif
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+  }],
+       
+  ue_list: [
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 1,
+      "imsi": "001010000000100",
+      "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, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 2,
+      "imsi": "001010000000101",
+      "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, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 3,
+      "imsi": "001010000000102",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, sd: 66051, }, ],
+      default_pdu_session_snssai: { sst: 1, sd: 66051, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 4,
+      "imsi": "001010000000103",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, sd: 66051, }, ],
+      default_pdu_session_snssai: { sst: 1, sd: 66051, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 5,
+      "imsi": "001010000000104",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, sd: 66051, }, ],
+      default_pdu_session_snssai: { sst: 1, sd: 66051, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+      /* USIM data */
+      "ue_id" : 6,
+      "imsi": "001010000000105",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, sd: 66051, }, ],
+      default_pdu_session_snssai: { sst: 1, sd: 66051, },
+
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      /* UE capabilities */
+   
+      /* USIM data */
+      "ue_id" : 7,
+      "imsi": "001010000000106",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, sd: 66051, }, ],
+      default_pdu_session_snssai: { sst: 1, sd: 66051, },
+
+
+      /* Enable it to allow sim_events to be handled remotely */
+      //rue_addr: "127.1.0.0",
+      /* Enable it to create a TUN interface for each UE PDN */
+      tun_setup_script: "ue-ifup",
+    },
+  ],
+}
+
--- a/ci-scripts/as_ue/oaicicd-3xue-noPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-3xue-noPing-SATest.cfg
@@ -1,172 +0,0 @@
-/* UE simulator configuration */
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 40
-#define UE_COUNT 3 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
-
-
-log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue0.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: CELL_BANDWIDTH,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:621312,
-      ssb_nr_arfcn:621312,
-
-      //band: 41,
-      //dl_nr_arfcn:517020,
-      //ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-}],
-
-    
-/* Enable it to allow sim_events to be handled remotely */
-//rue_bind_addr: "127.0.10.11",
-
-
-
-ue_list: [
-  {
-    /* UE capabilities */ 
-    /* USIM data */    
-    "ue_id" : 0,
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  }, /*end UE object 0*/
-  {
-    /* UE capabilities */ 
-    /* USIM data */  
-    "ue_id" : 1, 
-    "imsi": "208970100001128",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  }, /*end UE object 1*/
-  {
-    /* UE capabilities */
-    /* USIM data */
-    "ue_id" : 2,
-    "imsi": "208970100001129",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      },
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  } /*end UE object 2*/
-  ],/*end UE list*/
-}/*end json*/
-
--- a/ci-scripts/as_ue/oaicicd-multi-ue-1xPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-1xPing-SATest.cfg
@@ -1,142 +0,0 @@
-/* UE simulator configuration */
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 40
-#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
-
-
-log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue0.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: CELL_BANDWIDTH,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:621312,
-      ssb_nr_arfcn:621312,
-
-      //band: 41,
-      //dl_nr_arfcn:517020,
-      //ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-}],
-
-    
-/* Enable it to allow sim_events to be handled remotely */
-//rue_bind_addr: "127.0.10.11",
-
-
-
-ue_list: [
-  {
-    /* UE capabilities */ 
-    /* USIM data */    
-    "ue_id" : 1,
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  }, /*end UE object 0*/
-  {
-    /* UE capabilities */ 
-    /* USIM data */  
-    "ue_id" : 2, 
-    "imsi": "208970100001128",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 15,
-        end_time: 25,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"              
-      },
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  } /*end UE object 1*/
-  ],/*end UE list*/
-}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-multi-ue-2xPing-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-2xPing-SATest.cfg
@@ -1,150 +0,0 @@
-/* UE simulator configuration */
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 40
-#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
-
-
-log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue0.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: CELL_BANDWIDTH,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:621312,
-      ssb_nr_arfcn:621312,
-
-      //band: 41,
-      //dl_nr_arfcn:517020,
-      //ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-}],
-
-    
-/* Enable it to allow sim_events to be handled remotely */
-//rue_bind_addr: "127.0.10.11",
-
-
-
-ue_list: [
-  {
-    /* UE capabilities */ 
-    /* USIM data */    
-    "ue_id" : 1,
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 15,
-        end_time: 25,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"              
-      },
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  }, /*end UE object 0*/
-  {
-    /* UE capabilities */ 
-    /* USIM data */  
-    "ue_id" : 2, 
-    "imsi": "208970100001128",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 15,
-        end_time: 25,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"              
-      },
-      {
-        event: "power_off",
-        start_time: 30,
-      }
-    ] /*end sim events */
-  } /*end UE object 1*/
-  ],/*end UE list*/
-}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-multi-ue-2xPingSeq-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-multi-ue-2xPingSeq-SATest.cfg
@@ -1,150 +0,0 @@
-/* UE simulator configuration */
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 40
-#define UE_COUNT 2 // number of simulated UEs 208970100001127, 208970100001128, 208970100001129
-
-
-log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue0.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: CELL_BANDWIDTH,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:621312,
-      ssb_nr_arfcn:621312,
-
-      //band: 41,
-      //dl_nr_arfcn:517020,
-      //ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-}],
-
-    
-/* Enable it to allow sim_events to be handled remotely */
-//rue_bind_addr: "127.0.10.11",
-
-
-
-ue_list: [
-  {
-    /* UE capabilities */ 
-    /* USIM data */    
-    "ue_id" : 1,
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      },
-      {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 20,
-        end_time: 30,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"
-      },
-      {
-        event: "power_off",
-        start_time: 60,
-      }
-    ] /*end sim events */
-  }, /*end UE object 0*/
-  {
-    /* UE capabilities */ 
-    /* USIM data */  
-    "ue_id" : 2, 
-    "imsi": "208970100001128",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-      {
-      sst: 1,
-      sd: 66051,
-      },
-    ],
-    default_pdu_session_snssai: {
-      sst: 1,
-      sd: 66051,
-    },
-    /* Enable it to allow sim_events to be handled remotely */
-    //rue_addr: "127.1.0.0",
-    /* Enable it to create a TUN interface for each UE PDN */
-    tun_setup_script: "ue-ifup",
-    sim_events: [
-      {
-        event: "power_on",
-        start_time: 5,
-      }, 
-      {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 40,
-        end_time: 50,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"              
-      },
-      {
-        event: "power_off",
-        start_time: 60,
-      }
-    ] /*end sim events */
-  } /*end UE object 1*/
-  ],/*end UE list*/
-}/*end json*/
--- a/ci-scripts/as_ue/oaicicd-ue-Ping-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-ue-Ping-SATest.cfg
@@ -1,113 +0,0 @@
-/* UE simulator configuration */
-
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 40
-
-
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-  log_filename: "/tmp/ue1.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: false,
-    cells: [{
-      rf_port: 0,
-      bandwidth: CELL_BANDWIDTH,
-#if TDD == 1
-      band: 78,
-      dl_nr_arfcn:621312,
-      ssb_nr_arfcn:621312,
-
-      //band: 41,
-      //dl_nr_arfcn:517020,
-      //ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-
-
-       
-  /* Enable it to allow sim_events to be handled remotely */
-  //rue_bind_addr: "127.0.10.11",
-
-  ue_list: [
-    {
-      /* UE capabilities */
-   
-    /* USIM data */
-
-
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-
-
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-    {
-    sst: 1,
-    sd: 66051,
-    },
-    ],
-
-    default_pdu_session_snssai: {
-    sst: 1,
-    sd: 66051,
-    },
-
-
-      /* Enable it to allow sim_events to be handled remotely */
-      //rue_addr: "127.1.0.0",
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-
-      sim_events: [{
-        event: "power_on",
-        start_time: 5,
-      }, {
-       "tag": "ping",
-       "prog":"oai_ext_app.sh",
-        start_time: 15,
-        end_time: 25,
-        "args":["ping 192.168.70.136"],
-        "event":"ext_app"
-              
-      },
-      {
-        event: "power_off",
-        start_time: 30,
-      }]
-    }
-  ],
-}
--- a/ci-scripts/as_ue/oaicicd-ue-iperf-SATest.cfg
+++ b/ci-scripts/as_ue/oaicicd-ue-iperf-SATest.cfg
@@ -1,109 +0,0 @@
-/* UE simulator configuration */
-
-
-
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define TDD 1
-#define CELL_BANDWIDTH 20
-
-
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-  log_filename: "/tmp/ue0.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: false,
-    cells: [{
-      rf_port: 0,
-      bandwidth: CELL_BANDWIDTH,
-#if TDD == 1
-     // band: 78,
-     // dl_nr_arfcn:621312,
-     // ssb_nr_arfcn:621312,*/
-
-      band: 41,
-      dl_nr_arfcn:517020,
-      ssb_nr_arfcn:516990,
-#else
-      band: 7,
-      dl_nr_arfcn: 536020,
-      ssb_nr_arfcn: 535930,
-      ssb_subcarrier_spacing: 15,
-#endif
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-
-
-       
-  /* Enable it to allow sim_events to be handled remotely */
-  //rue_bind_addr: "127.0.10.11",
-
-  ue_list: [
-    {
-      /* UE capabilities */
-   
-    /* USIM data */
-     
-    "imsi": "208970100001127",
-    "K": "fec86ba6eb707ed08905757b1bb44b8f",
-    "sim_algo":"milenage",
-    "op": "1006020f0a478bf6b699f15c062e42b3",
-
-
-    as_release: 15,
-    ue_category: "nr",
-    apn:"oai",
-    attach_pdn_type:"ipv4",
-    default_nssai: [
-    {
-    sst: 1,
-    sd: 1,
-    },
-    ],
-
-    default_pdu_session_snssai: {
-    sst: 1,
-    sd: 1,
-    },
-
-
-      /* Enable it to allow sim_events to be handled remotely */
-      //rue_addr: "127.1.0.0",
-
-      /* Enable it to create a TUN interface for each UE PDN */
-      tun_setup_script: "ue-ifup",
-
-      sim_events: [{
-        event: "power_on",
-        start_time: 5,
-      }, {
-        event: "ext_app",
-        start_time: 15,
-        end_time: 25,
-        prog: "ext_app.sh",
-        args: ["iperf", " -c  172.21.10.5", " -u"," -b 1M"," -i 1"," -t 10"]
-      }, {
-        event: "power_off",
-        start_time: 30,
-      }]
-    }
-  ],
-}
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -49,75 +49,75 @@ adb_ue_2:

 amarisoft_ue:
  Host: amariue
-  InitScript: nohup /root/NV18-06-2022/ue/lteue /root/NV18-06-2022/ue/config/oaicicd-ue-ci-test.cfg &
-  TermScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-asue.cfg &
+  TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
 amarisoft_ue_1:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
  UENetworkScript: ip netns exec ue1 ip a show dev pdn0
  CmdPrefix: ip netns exec ue1
  MTU: 1500
 amarisoft_ue_2:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
  UENetworkScript: ip netns exec ue2 ip a show dev pdn0
  CmdPrefix: ip netns exec ue2
  MTU: 1500
 amarisoft_ue_3:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
  UENetworkScript: ip netns exec ue3 ip a show dev pdn0
  CmdPrefix: ip netns exec ue3
  MTU: 1500
 amarisoft_ue_4:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
  UENetworkScript: ip netns exec ue4 ip a show dev pdn0
  CmdPrefix: ip netns exec ue4
  MTU: 1500
 amarisoft_ue_5:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
  UENetworkScript: ip netns exec ue5 ip a show dev pdn0
  CmdPrefix: ip netns exec ue5
  MTU: 1500
 amarisoft_ue_6:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
  UENetworkScript: ip netns exec ue6 ip a show dev pdn0
  CmdPrefix: ip netns exec ue6
  MTU: 1500
 amarisoft_ue_7:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
  UENetworkScript: ip netns exec ue7 ip a show dev pdn0
  CmdPrefix: ip netns exec ue7
  MTU: 1500
 amarisoft_ue_8:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
  UENetworkScript: ip netns exec ue8 ip a show dev pdn0
  CmdPrefix: ip netns exec ue8
  MTU: 1500
 amarisoft_ue_9:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
  UENetworkScript: ip netns exec ue9 ip a show dev pdn0
  CmdPrefix: ip netns exec ue9
  MTU: 1500
 amarisoft_ue_10:
  Host: amariue
-  AttachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/NV18-06-2022/lteue-linux-2022-06-18/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  AttachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
  UENetworkScript: ip netns exec ue10 ip a show dev pdn0
  CmdPrefix: ip netns exec ue10
  MTU: 1500
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -40,6 +40,29 @@ import cls_cmd

 IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
 NAMESPACE = "oaicicd-ran"
+OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
+
+
+def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
+	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
+		HELP.GenericHelp(CONST.Version)
+		sys.exit('Insufficient Parameter: no OC Credentials')
+	if OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and end on a slash /')
+	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
+	if ret.returncode != 0:
+		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+		return False
+	ret = cmd.run(f'oc project {ocProjectName}')
+	if ret.returncode != 0:
+		logging.error(f'\u001B[1mUnable to access OC project {ocProjectName}\u001B[0m')
+		OC_logout(cmd)
+		return False
+	return True
+
+def OC_logout(cmd):
+	cmd.run(f'oc logout')

 class Cluster:
 	def __init__(self):
@@ -57,7 +80,7 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
-
+		self.imageToPull = ''

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

+	def PullClusterImage(self, HTML, RAN):
+		if self.imageToPull == '':
+			HELP.GenericHelp(CONST.Version)
+			HELP.EPCSrvHelp(self.imageToPull)
+			sys.exit('Insufficient eNB Parameters')
+		lIpAddr = self.eNBIPAddress
+		self.testCase_id = HTML.testCase_id
+		cmd = cls_cmd.getConnection(lIpAddr)
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, self.OCProjectName)
+		if not succeeded:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
+		if ret.returncode != 0:
+			logging.error(f'\u001B[1m Unable to access OC project {ocProjectName}\u001B[0m')
+			OC_logout(cmd)
+			cmd.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		for image in self.imageToPull:
+			imagePrefix = f'{self.OCRegistry}{self.OCProjectName}'
+			imageTag = cls_containerize.ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
+				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
+				OC_logout(cmd)
+				cmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+		OC_logout(cmd)
+		cmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
+
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
-
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
@@ -204,7 +263,6 @@ class Cluster:

 		baseTag = 'develop'
 		forceBaseImageBuild = False
-		imageTag = 'develop'
 		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
 			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == 'develop':
@@ -214,6 +272,7 @@ class Cluster:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 		else:
+			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True

 		# logging to OC Cluster and then switch to corresponding project
@@ -273,11 +332,18 @@ class Cluster:
 			ranbuild_job = self._start_build('ran-build')
 			attemptedImages += ['ran-build']

-			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end([ranbuild_job, physim_job], 1200)
-			if not wait: logging.error('error during build of ranbuild_job or physim_job')
+			self._recreate_is_tag('oai-clang', imageTag, 'openshift/oai-clang-is.yaml')
+			self._recreate_bc('oai-clang', imageTag, 'openshift/oai-clang-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.clang.rhel8.2')
+			clang_job = self._start_build('oai-clang')
+			attemptedImages += ['oai-clang']
+
+			wait = ranbuild_job is not None and physim_job is not None and clang_job is not None and self._wait_build_end([ranbuild_job, physim_job, clang_job], 1200)
+			if not wait: logging.error('error during build of ranbuild_job or physim_job or clang_job')
 			status = status and wait
 			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
 			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
+			self.cmd.run(f'oc logs {clang_job} &> cmake_targets/log/oai-clang.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

 		if status:
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -31,8 +31,8 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
-import sys              # arg
-import re               # reg
+import sys	      # arg
+import re	       # reg
 import logging
 import os
 import shutil
@@ -47,6 +47,7 @@ from zipfile import ZipFile
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import cls_cluster as OC
 import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
@@ -90,6 +91,15 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 		logging.debug(f'Merging with the target branch: {ranTargetBranch}')
 		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)

+def ImageTagToUse(imageName, ranCommitID, ranBranch, ranAllowMerge):
+	shortCommit = ranCommitID[0:8]
+	if ranAllowMerge:
+		tagToUse = f'{ranBranch}-{shortCommit}'
+	else:
+		tagToUse = f'develop-{shortCommit}'
+	fullTag = f'{imageName}:{tagToUse}'
+	return fullTag
+
 def CopyLogsToExecutor(cmd, sourcePath, log_name):
 	cmd.cd(f'{sourcePath}/cmake_targets')
 	cmd.run(f'rm -f {log_name}.zip')
@@ -306,7 +316,6 @@ class Containerize():
 		self.registrySvrId = ''
 		self.testSvrId = ''
 		self.imageToPull = []
-
 		#checkers from xml
 		self.ran_checkers={}

@@ -383,7 +392,7 @@ class Containerize():
 	
 		CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

- 		# if asterix, copy the entitlement and subscription manager configurations
+		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
 			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
 			cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
@@ -649,15 +658,6 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

-	def ImageTagToUse(self, imageName):
-		shortCommit = self.ranCommitID[0:8]
-		if self.ranAllowMerge:
-			tagToUse = f'{self.ranBranch}-{shortCommit}'
-		else:
-			tagToUse = f'develop-{shortCommit}'
-		fullTag = f'porcepix.sboai.cs.eurecom.fr/{imageName}:{tagToUse}'
-		return fullTag
-
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
 			lIpAddr = self.eNBIPAddress
@@ -680,8 +680,8 @@ class Containerize():
 		logging.debug('Pushing images from server: ' + lIpAddr)
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
-
-		mySSH.command('docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr', '\$', 5)
+		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
+		mySSH.command(f'docker login -u oaicicd -p oaicicd {imagePrefix}', '\$', 5)
 		if re.search('Login Succeeded', mySSH.getBefore()) is None:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
@@ -694,9 +694,9 @@ class Containerize():
 			orgTag = 'ci-temp'
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = self.ImageTagToUse(image)
-			mySSH.command(f'docker image tag {image}:{orgTag} {tagToUse}', '\$', 5)
-			mySSH.command(f'docker push {tagToUse}', '\$', 120)
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
+			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
 				msg = f'Could not push {image} to local registry : {tagToUse}'
@@ -704,9 +704,9 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			mySSH.command(f'docker rmi {tagToUse} {image}:{orgTag}', '\$', 30)
+			mySSH.command(f'docker rmi {imagePrefix}/{tagToUse} {image}:{orgTag}', '\$', 30)

-		mySSH.command('docker logout porcepix.sboai.cs.eurecom.fr', '\$', 5)
+		mySSH.command(f'docker logout {imagePrefix}', '\$', 5)
 		if re.search('Removing login credentials', mySSH.getBefore()) is None:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
@@ -739,25 +739,18 @@ class Containerize():
 		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
-		if lIpAddr != 'none':
-			logging.debug('Pulling images onto server: ' + lIpAddr)
-			myCmd = cls_cmd.RemoteCmd(lIpAddr)
-		else:
-			logging.debug('Pulling images locally')
-			myCmd = cls_cmd.LocalCmd()
-
-		cmd = 'docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr'
-		response = myCmd.run(cmd)
+		myCmd = cls_cmd.getConnection(lIpAddr)
+		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
+		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
 		if response.returncode != 0:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
 			myCmd.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
-
 		for image in self.imageToPull:
-			tagToUse = self.ImageTagToUse(image)
-			cmd = f'docker pull {tagToUse}'
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'docker pull {imagePrefix}/{tagToUse}'
 			response = myCmd.run(cmd, timeout=120)
 			if response.returncode != 0:
 				logging.debug(response)
@@ -766,16 +759,15 @@ class Containerize():
 				myCmd.close()
 				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-
-		cmd = 'docker logout porcepix.sboai.cs.eurecom.fr'
-		response = myCmd.run(cmd)
+			myCmd.run(f'docker tag {imagePrefix}/{tagToUse} oai-ci/{tagToUse}')
+			myCmd.run(f'docker rmi {imagePrefix}/{tagToUse}')
+		response = myCmd.run(f'docker logout {imagePrefix}')
 		if response.returncode != 0:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
 			myCmd.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
-
 		myCmd.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
@@ -810,7 +802,8 @@ class Containerize():

 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			cmd = f'docker rmi {self.ImageTagToUse(image)}'
+			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'docker rmi oai-ci/{imageTag}'
 			myCmd.run(cmd, reportNonZero=False)

 		myCmd.close()
@@ -844,11 +837,11 @@ class Containerize():
 		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)
-		mySSH.command('cp docker-compose.yml ci-docker-compose.yml', '\$', 5)
-		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup']
+		mySSH.command('cp docker-compose.y*ml ci-docker-compose.yml', '\$', 5)
+		imagesList = ['oai-enb', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s']
 		for image in imagesList:
-			imageToUse = self.ImageTagToUse(image)
-			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: {imageToUse}#" ci-docker-compose.yml', '\$', 2)
+			imageTag = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			mySSH.command(f'sed -i -e "s#image: {image}:latest#image: oai-ci/{imageTag}#" ci-docker-compose.yml', '\$', 2)
 		localMmeIpAddr = EPC.MmeIPAddress
 		mySSH.command('sed -i -e "s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/" ci-docker-compose.yml', '\$', 2)

@@ -966,6 +959,7 @@ class Containerize():
 		logging.debug('\u001B[1m Undeploying OAI Object from server: ' + lIpAddr + '\u001B[0m')
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
+
 		mySSH.command('cd ' + lSourcePath + '/' + self.yamlPath[self.eNB_instance], '\$', 5)

 		svcName = self.services[self.eNB_instance]
@@ -980,8 +974,8 @@ class Containerize():
 		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')[3:-1]
-			#logging.debug(f'running services: {running}')
+			running = mySSH.getBefore().split('\r\n')[2:-1]
+			logging.debug(f'running services: {running}')
 			if len(running) > 0: # something is running for that service
 				services.append(s)
 		logging.info(f'stopping services {services}')
@@ -1050,13 +1044,12 @@ class Containerize():
 			myCmd.close()
 			HTML.CreateHtmlTestRow('SVC not Found', 'KO', CONST.ALL_PROCESSES_OK)
 			return
-
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = self.ImageTagToUse(image)
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True

@@ -1193,13 +1186,12 @@ class Containerize():
 		ymlPath = self.yamlPath[0].split('/')
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
-
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
 		myCmd.run(cmd, silent=self.displayedNewTags)
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
-			tagToUse = self.ImageTagToUse(image)
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@{tagToUse}@" docker-compose-ci.yml'
+			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True

@@ -1490,11 +1482,6 @@ class Containerize():
 			result = re.search('172.21.16.128', mySSH.getBefore())
 			if result is None:
 				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10)
-			# Check if route to nepes gnb exists
-			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
-			result = re.search('172.21.16.137', mySSH.getBefore())
-			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10)
 			# Check if forwarding is enabled
 			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
 			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
@@ -1564,16 +1551,28 @@ class Containerize():
 			mySSH.close()
 		if svrName == 'nepes':
 			mySSH.open(ipAddr, userName, password)
-			# Check if route to porcepix epc exists
-			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
-			result = re.search('172.21.16.136', mySSH.getBefore())
+			# Check if route to ofqot gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.109', mySSH.getBefore())
 			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev enp0s31f6', '\$', 10)
-			# Check if X2 route to obelix enb exists
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10)
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'ofqot':
+			mySSH.open(ipAddr, userName, password)
+			# Check if X2 route to nepes enb/epc exists
 			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
-			result = re.search('172.21.16.128', mySSH.getBefore())
+			result = re.search('172.21.16.137', mySSH.getBefore())
 			if result is None:
-				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev enp0s31f6', '\$', 10)
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10)
 			# Check if forwarding is enabled
 			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
 			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -461,7 +461,7 @@ class OaiCiTest():
 					doInterfaceCheck = True
 			# For the moment, only in explicit noS1 without kernel module (ie w/ tunnel interface)
 			if self.air_interface == 'nr-uesoftmodem':
-				result = re.search('--noS1 --nokrnmod 1', str(self.Initialize_OAI_UE_args))
+				result = re.search('--noS1', str(self.Initialize_OAI_UE_args))
 				if result is not None:
 					doInterfaceCheck = True
 			if doInterfaceCheck:
@@ -605,6 +605,8 @@ class OaiCiTest():
 					Target = EPC.MmeIPAddress
 				elif re.match('OAICN5G', EPC.Type, re.IGNORECASE):
 					Target = EPC.MmeIPAddress
+				elif re.match('OC-OAI-CN5G', EPC.Type, re.IGNORECASE):
+					Target = "172.21.6.100"
 				else:
 					Target = EPC.IPAddress
 				#ping from module NIC rather than IP address to make sure round trip is over the air	
@@ -1227,7 +1229,7 @@ class OaiCiTest():
 				raise Exception("could not corver prod-trf-gen IP address")
 			cn_target_ip = result.group('trf_ip_addr')
 			SSH.close()
-			cn_iperf_prefix = "docker exec -it prod-trf-gen" # -w /iperf-2.0.13  necessary?
+			cn_iperf_prefix = "docker exec  prod-trf-gen" # -w /iperf-2.0.13  necessary?
 		else: # ltebox, sabox
 			cn_target_ip = "192.172.0.1"
 			cn_iperf_prefix = ""
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -114,7 +114,7 @@ class PhySim:
 				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
 				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
 		else:
-			imageTag = "develop"
+			imageTag = f'develop-{self.ranCommitID[0:8]}'

 		# logging to OC Cluster and then switch to corresponding project
 		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30)
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
@@ -172,7 +172,7 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -191,11 +191,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf
@@ -172,7 +172,7 @@ eNBs =


    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -191,11 +191,11 @@ eNBs =
    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.21.16.128";
        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.21.16.128";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.21.16.128";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
  }
--- a/ci-scripts/conf_files/gNB_SA_CU.conf
+++ b/ci-scripts/conf_files/gNB_SA_CU.conf
@@ -169,7 +169,7 @@ gNBs =


    ////////// AMF parameters:
-        amf_ip_address      = ( { ipv4       = "192.168.5.233";
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -178,11 +178,10 @@ gNBs =

    NETWORK_INTERFACES :
    {
-
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
@@ -213,7 +212,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -233,7 +233,7 @@ serveraddr = "server";
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -274,5 +274,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                        ="info";
    };
--- a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -270,5 +270,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
    };
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -222,7 +222,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -81,7 +81,7 @@ security = {
       rlc_log_level                         ="debug";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
       ngap_log_level                         ="debug";
    };

--- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
@@ -233,6 +233,6 @@ log_config :
  rlc_log_level    = "info";
  pdcp_log_level   = "info";
  rrc_log_level    = "info";
-  f1ap_log_level   = "debug";
+  f1ap_log_level   = "info";
  ngap_log_level   = "debug";
 };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
@@ -278,5 +278,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                        ="info";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -276,5 +276,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
@@ -277,5 +277,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -280,5 +280,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_log_level                         ="info";
    };
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -279,5 +279,5 @@ security = {
       rlc_log_level                         ="info";
       pdcp_log_level                        ="info";
       rrc_log_level                         ="info";
-       f1ap_log_level                         ="debug";
+       f1ap_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
@@ -280,5 +280,5 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
+  f1ap_log_level                        ="info";
 };
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -158,65 +158,6 @@ gNBs =

  );

-# Dedicated Serving Cell Configuration
-servingCellConfigDedicated = ({
-  # BWP-Downlink
-    # BWP 1 Configuration
-      dl_bwp-Id_1 = 1;
-      dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp1_subcarrierSpacing = 1;
-
-    # BWP 2 Configuration
-      dl_bwp-Id_2 = 2;
-      dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp2_subcarrierSpacing = 1;
-
-    # BWP 3 Configuration
-      dl_bwp-Id_3 = 3;
-      dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_bwp3_subcarrierSpacing = 1;
-
-    firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-    defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-    # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-    #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-    #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-    #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-  # UplinkConfig
-    # BWP-Uplink
-      # BWP 1 Configuration
-        ul_bwp-Id_1 = 1;
-        ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        ul_bwp-Id_2 = 2;
-        ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        ul_bwp-Id_3 = 3;
-        ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_bwp3_subcarrierSpacing = 1;
-
-      firstActiveUplinkBWP-Id = 1;  #BWP-Id
-  }
-);
-
    # ------- SCTP definitions
    SCTP :
    {
@@ -331,5 +272,5 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
+  f1ap_log_level                        ="info";
 };
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -0,0 +1,281 @@
+Active_gNBs = ( "gNB-Eurecom-n78_20");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+#device :{
+# name = "aw2sori_transpro";
+#}
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_CU_ID = 0xe00;
+
+    gNB_name  =  "gNB-Eurecom-n78_20";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  0x1;
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+
+    nr_cellid = 12345678L
+
+    ////////// Physical parameters:
+    pdsch_AntennaPorts_XP                                     = 2;
+    pusch_AntennaPorts                                        = 2;
+    do_CSIRS                                                  = 1;
+    do_SRS                                                    = 0;
+
+    pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 11;
+        searchSpaceZero = 0;
+      }
+    );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
+      absoluteFrequencySSB                                             = 627360;
+      dl_frequencyBand                                                 = 78;
+      # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
+      dl_absoluteFrequencyPointA                                       = 626748;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 51;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=0,L=50 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                                        = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                           = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                                      = 11; # this means shift of 14, so Coreset is in PRBs 1..48, SSB starts at PRB 15
+        initialDLBWPsearchSpaceZero                                             = 0;
+      #pdsch-ConfigCommon
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                                 = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 51;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                                        = 13750;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                                           = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 15;
+          preambleReceivedTargetPower                               = -104;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-96;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -96;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 5;
+      nrofDownlinkSlots                                             = 2;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+  ssPBCH_BlockPower                                             = -10;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "172.21.6.100";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eno33np0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/20";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eno33np0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/20";
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+  }
+);
+
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "local_RRC";
+    pusch_TargetSNRx10 = 200;
+    pucch_TargetSNRx10 = 200;
+    ulsch_max_frame_inactivity = 10;
+    ul_max_mcs         = 15;
+  }
+);
+
+L1s = (
+        {
+        num_cc = 1;
+        tr_n_preference = "local_mac";
+        prach_dtx_threshold = 120;
+        pucch0_dtx_threshold = 50;
+        pusch_dtx_threshold = 10;
+        }
+);
+
+RUs = (
+    {
+        local_if_name  = "ens7f3";
+        remote_address = "192.168.80.239";
+        local_address  = "192.168.80.24";
+        local_portc    = 50000;
+        remote_portc   = 55444;
+        local_portd    = 52001;
+        remote_portd   = 52183;
+        local_rf       = "no"
+        tr_preference  = "udp_ecpri_if5"
+        nb_tx          = 2
+        nb_rx          = 2
+        att_tx         = 16
+        att_rx         = 0;
+        num_tp_cores   = 4;
+        rxfh_core_id   = 9;
+        txfh_core_id   = 10;
+        tp_cores       = [11,12,13,14];
+        nr_flag        = 1;
+        eNB_instances  = [0];
+        bands          = [78];
+        sl_ahead       = 5;
+        ##beamforming 1x2 matrix: 1 layer x 2 antennas
+        bf_weights = [0x00007fff, 0x0000];
+        ##beamforming 1x4 matrix: 1 layer x 4 antennas
+        #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+        ## beamforming 2x2 matrix:
+        # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+        ## beamforming 4x4 matrix:
+        #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+    }
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+     log_config :
+     {
+       global_log_level                      ="info";
+       global_log_verbosity                  ="medium";
+       hw_log_level                          ="info";
+       hw_log_verbosity                      ="medium";
+       phy_log_level                         ="info";
+       phy_log_verbosity                     ="medium";
+       mac_log_level                         ="info";
+       mac_log_verbosity                     ="high";
+       rlc_log_level                         ="info";
+       rlc_log_verbosity                     ="medium";
+       pdcp_log_level                        ="info";
+       pdcp_log_verbosity                    ="medium";
+       rrc_log_level                         ="info";
+       rrc_log_verbosity                     ="medium";
+       f1ap_log_level                         ="debug";
+       f1ap_log_verbosity                     ="medium";
+       ngap_log_level                         ="debug";
+       ngap_log_verbosity                     ="medium";
+    };
+
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -262,6 +262,6 @@ log_config :
  pdcp_log_level                        ="info";
  rrc_log_level                         ="info";
  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
+  f1ap_log_level                        ="info";
 };

--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -14,8 +14,8 @@ Ref :
  L1 Tx processing : 210.0
  DLSCH encoding : 137.0
  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 184.0
-  PUSCH decoding : 276.0
+  PUSCH inner-receiver : 210.0
+  PUSCH decoding : 210.0
  Schedule Response : 48.0
  DL & UL scheduling timing : 13.0
  UL Indication : 60.0
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -14,10 +14,10 @@ Ref :
  L1 Tx processing : 400.0
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 184.0
-  PUSCH decoding : 276.0 
+  PUSCH inner-receiver : 210.0
+  PUSCH decoding : 210.0
  Schedule Response : 111.0
-  DL & UL scheduling timing : 37.0
+  DL & UL scheduling timing : 20.0
  UL Indication : 127.0
 Threshold :
  feprx : 1.25
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -14,11 +14,11 @@ Ref :
  L1 Tx processing : 170.0
  DLSCH encoding : 118.0
  L1 Rx processing : 305.0
-  PUSCH inner-receiver : 117.0
-  PUSCH decoding : 303.0
-  Schedule Response : 25.0
+  PUSCH inner-receiver : 150.0
+  PUSCH decoding : 210.0
+  Schedule Response : 20.0
  DL & UL scheduling timing : 10.0
-  UL Indication : 34.0
+  UL Indication : 30.0
 Threshold :
  feprx : 1.25
  feptx_prec : 1.25
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -31,8 +31,8 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
-import sys              # arg
-import re               # reg
+import sys	      # arg
+import re	       # reg
 import logging
 import os
 import time
@@ -46,10 +46,13 @@ from multiprocessing import Process, Lock, SimpleQueue
 import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
-
+import cls_cluster as OC
+import cls_cmd
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
+
+
 class EPCManagement():

 	def __init__(self):
@@ -68,7 +71,13 @@ class EPCManagement():
 		self.isMagmaUsed = False
 		self.cfgDeploy = '--type start-mini --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap' #from xml, 'mini' is default normal for docker-network.py
 		self.cfgUnDeploy = '--type stop-mini --scenario 1' #from xml, 'mini' is default normal for docker-network.py
-
+		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
+		self.OCUserName = ''
+		self.OCPassword = ''
+		self.OCProjectName = ''
+		self.imageToPull = ''
+		self.eNBSourceCodePath = ''

 #-----------------------------------------------------------
 # EPC management functions
@@ -235,8 +244,7 @@ class EPCManagement():
 			HELP.GenericHelp(CONST.Version)
 			HELP.EPCSrvHelp(self.IPAddress, self.UserName, self.Password, self.SourceCodePath, self.Type)
 			sys.exit('Insufficient EPC Parameters')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
+		mySSH = cls_cmd.getConnection(self.IPAddress)
 		html_cell = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
 			logging.debug('Using the SABOX simulated HSS')
@@ -286,6 +294,40 @@ class EPCManagement():
 					if res4 is not None:
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			self.testCase_id = HTML.testCase_id
+			imageNames = ["oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "mysql","oai-traffic-server"]
+			logging.debug('Deploying OAI CN5G on Openshift Cluster')
+			lIpAddr = self.IPAddress
+			lSourcePath = self.SourceCodePath
+			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, self.OCProjectName)
+			if not succeeded:
+				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+				return False
+			for ii in imageNames:
+					mySSH.run(f'helm uninstall {ii}', reportNonZero=False)
+			mySSH.run(f'helm spray {lSourcePath}/ci-scripts/charts/oai-5g-basic/.')
+			ret = mySSH.run(f'oc get pods', silent=True)
+			if ret.stdout.count('Running') != 9:
+				logging.error('\u001B[1m Deploying 5GCN Failed using helm chart on OC Cluster\u001B[0m')
+				for ii in imageNames:
+					mySSH.run('helm uninstall '+ ii)
+				ret = mySSH.run(f'oc get pods')
+				if re.search('No resources found', ret.stdout):
+					logging.debug('All pods uninstalled')
+					OC.OC_logout(mySSH)
+					mySSH.close()
+					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
+					return False
+			ret = mySSH.run(f'oc get pods', silent=True)
+			for line in ret.stdout.split('\n')[1:]:
+				columns = line.strip().split()
+				name = columns[0]
+				status = columns[2]
+				html_cell += status + '    ' + name
+				html_cell += '\n'
+			OC.OC_logout(mySSH)
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
@@ -311,6 +353,10 @@ class EPCManagement():
 			else:
 				logging.error('no container with name oai-amf found, could not retrieve AMF IP address')
 			mySSH.close()
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			mySSH = SSH.SSHConnection()
+			mySSH.open(self.IPAddress, self.UserName, self.Password)
+			response=mySSH.command3('oc pods ls -f name=oai-amf', 10)

 	def CheckHSSProcess(self, status_queue):
 		try:
@@ -513,8 +559,9 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)

 	def Terminate5GCN(self, HTML):
-		mySSH = SSH.SSHConnection()
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
+		imageNames = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
+		containerInPods = ["", "-c nrf", "-c amf", "-c smf", "-c spgwu", "-c ausf", "-c udm", "-c udr", ""]
+		mySSH = cls_cmd.getConnection(self.IPAddress)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
 			logging.debug('Terminating SA BOX')
@@ -545,6 +592,37 @@ class EPCManagement():
 			else:
 				message = 'No Tracking area update request'
 			logging.debug(message)
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			logging.debug('Terminating OAI CN5G on Openshift Cluster')
+			lIpAddr = self.IPAddress
+			lSourcePath = self.SourceCodePath
+			mySSH.run(f'rm -Rf {lSourcePath}/logs')
+			mySSH.run(f'mkdir -p {lSourcePath}/logs')
+			logging.debug('OC OAI CN5G - Collecting Log files to workspace')
+			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, self.OCProjectName)
+			if not succeeded:
+				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+				return False
+			mySSH.run(f'oc describe pod &> {lSourcePath}/logs/describe-pods-post-test.log')
+			mySSH.run(f'oc get pods.metrics.k8s &> {lSourcePath}/logs/nf-resource-consumption.log')
+			for ii, ci in zip(imageNames, containerInPods):
+			       podName = mySSH.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
+			       if not podName:
+				       logging.debug(f'{ii} pod not found!')
+				       HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
+				       HTML.CreateHtmlTabFooter(False)
+			       mySSH.run(f'oc logs -f {podName} {ci} &> {lSourcePath}/logs/{ii}.log &')
+			       mySSH.run(f'helm uninstall {ii}')
+			       podName = ''
+			mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq test_logs_CN.zip *.log')
+			mySSH.copyin(f'{lSourcePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
+			ret = mySSH.run(f'oc get pods', silent=True)
+			res = re.search('No resources found in oaicicd-ran namespace.', ret.stdout)
+			if res is not None:
+			       logging.debug('OC OAI CN5G components uninstalled')
+			       message = 'OC OAI CN5G components uninstalled'
+			OC.OC_logout(mySSH)
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
@@ -784,6 +862,8 @@ class EPCManagement():
 				mySSH.command('zip hss.log.zip hss_check_run.*', '\$', 60)
 		elif re.match('OAICN5G', self.Type, re.IGNORECASE):
 			logging.debug('LogCollect is bypassed for that variant')
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			logging.debug('LogCollect is bypassed for that variant')
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip hss.log.zip hss*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm hss*.log', '\$', 5)
@@ -798,10 +878,13 @@ class EPCManagement():
 		mySSH.close()

 	def LogCollectMME(self):
-		mySSH = SSH.SSHConnection()
-		mySSH.open(self.IPAddress, self.UserName, self.Password)
-		mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
-		mySSH.command('rm -f mme.log.zip', '\$', 5)
+		if self.Type != 'OC-OAI-CN5G':
+			mySSH = SSH.SSHConnection()
+			mySSH.open(self.IPAddress, self.UserName, self.Password)
+			mySSH.command('cd ' + self.SourceCodePath + '/scripts', '\$', 5)
+			mySSH.command('rm -f mme.log.zip', '\$', 5)
+		else:
+			mySSH = cls_cmd.getConnection(self.IPAddress)
 		if re.match('OAI-Rel14-Docker', self.Type, re.IGNORECASE):
 			mySSH.command('docker inspect prod-oai-mme', '\$', 10)
 			result = re.search('No such object', mySSH.getBefore())
@@ -819,6 +902,10 @@ class EPCManagement():
 			mySSH.command('cp -f /tmp/oai-cn5g-v1.5.pcap .','\$', 30)
 			mySSH.command('zip mme.log.zip oai-amf.log oai-nrf.log oai-cn5g*.pcap','\$', 30)
 			mySSH.command('mv mme.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			mySSH.run('cd ' + self.SourceCodePath + '/logs')
+			mySSH.run('zip mme.log.zip oai-amf.log oai-nrf.log oai-cn5g*.pcap')
+			mySSH.run('mv mme.log.zip ' + self.SourceCodePath + '/scripts')
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip mme.log.zip mme*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm mme*.log', '\$', 5)
@@ -852,6 +939,10 @@ class EPCManagement():
 			mySSH.command('cd ' + self.SourceCodePath + '/logs','\$', 5)
 			mySSH.command('zip spgw.log.zip oai-smf.log oai-spgwu.log','\$', 30)
 			mySSH.command('mv spgw.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
+		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
+			mySSH.command('cd ' + self.SourceCodePath + '/logs','\$', 5)
+			mySSH.command('zip spgw.log.zip oai-smf.log oai-spgwu.log','\$', 30)
+			mySSH.command('mv spgw.log.zip ' + self.SourceCodePath + '/scripts','\$', 30)
 		elif re.match('OAI', self.Type, re.IGNORECASE) or re.match('OAI-Rel14-CUPS', self.Type, re.IGNORECASE):
 			mySSH.command('zip spgw.log.zip spgw*.log', '\$', 60)
 			mySSH.command('echo ' + self.Password + ' | sudo -S rm spgw*.log', '\$', 5)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -38,12 +38,12 @@ import helpreadme as HELP
 import constants as CONST


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

 import sshconnection 
 import epc
@@ -429,7 +429,12 @@ def GetParametersFromXML(action):
 	elif action == 'Custom_Command':
 		RAN.node = test.findtext('node')
 		RAN.command = test.findtext('command')
-
+		RAN.command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
+	elif action == 'Pull_Cluster_Image':
+		# CLUSTER.imageToPull.clear()
+		string_field = test.findtext('images_to_pull')
+		if (string_field is not None):
+			CLUSTER.imageToPull = string_field.split()
 	else:
 		logging.warning(f"unknown action {action} from option-parsing point-of-view")

@@ -705,6 +710,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	# On CI bench w/ containers, we need to validate if IP routes are set
 	if EPC.IPAddress == '172.21.16.136':
 		CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password)
+	if EPC.IPAddress == '172.21.16.137':
+		CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password)
 	if CONTAINERS.eNBIPAddress == '172.21.16.127':
 		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.127':
@@ -713,6 +720,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.128':
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
+	if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot':
+		CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNBIPAddress == '172.21.16.137':
 		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.137':
@@ -752,6 +761,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				elif action == 'Custom_Command':
 					logging.info(f"Executing custom command")
 					RAN.CustomCommand(HTML)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
 				elif action == 'Initialize_eNB':
 					RAN.InitializeeNB(HTML, EPC)
 					if RAN.prematureExit:
@@ -822,6 +833,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					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
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -99,6 +99,7 @@ class RANManagement():
 		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 		self.node = ''
 		self.command = ''
+		self.command_fail = False


 #-----------------------------------------------------------
@@ -259,19 +260,24 @@ class RANManagement():
 		self.checkBuildeNB(lIpAddr, lUserName, lPassWord, lSourcePath, self.backgroundBuildTestId[int(self.eNB_instance)], HTML)

 	def CustomCommand(self, HTML):
-		if self.node == '' or self.node == "localhost":
-			cmd = cls_cmd.LocalCmd()
-		else:
-			cmd = cls_cmd.RemoteCmd(self.node)
+		cmd = cls_cmd.getConnection(self.node)
 		ret = cmd.run(self.command)
 		cmd.close()
-		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode} output: {ret.stdout}')
-		html_queue = SimpleQueue()
+		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode}')
 		status = 'OK'
-		if ret.returncode != 0:
-			html_queue.put(ret.stdout)
+		message = []
+		if ret.returncode != 0 and not self.command_fail:
+			message = [ret.stdout]
+			logging.warning(f'CustomCommand output: {message}')
 			status = 'Warning'
-		HTML.CreateHtmlTestRow(self.command, status, 1, html_queue)
+		if self.command_fail: # important command since it would make the pipeline fail, so show output in HTML
+			message = [ret.stdout]
+		if ret.returncode != 0 and self.command_fail:
+			message = [ret.stdout]
+			logging.error(f'CustomCommand failed: output: {message}')
+			status = 'KO'
+			self.prematureExit = True
+		HTML.CreateHtmlTestRowQueue(self.command, status, message)

 	def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId, HTML):
 		HTML.testCase_id=testcaseId
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,5 +1,6 @@
  - Build_Proxy
  - Build_Cluster_Image
+  - Pull_Cluster_Image
  - Build_PhySim
  - Run_LDPCTest
  - Run_LDPCt1Test
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>a6169d8</proxy_commit>
+                <proxy_commit>a2fa216</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>a6169d8</proxy_commit>
+                <proxy_commit>a2fa216</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -27,6 +27,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
    <htmlTabName>Test-TDD-05MHz-TM1</htmlTabName>
    <htmlTabIcon>tasks</htmlTabIcon>
    <TestCaseRequestedList>
+300000
 100000
 111110
 040101
@@ -57,6 +58,13 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
        <command>sudo cpupower idle-set -E</command>
    </testCase>

+    <testCase id="300000">
+	<class>Custom_Command</class>
+	<desc>Reset USRP</desc>
+	<node>starsky</node>
+	<command>sudo -S b2xx_fx3_utils --reset-device</command>
+    </testCase>
+
    <testCase id="030104">
        <class>Deploy_Object</class>
        <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -0,0 +1,160 @@
+<!--
+
+ 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-LTE-2x2-N3XX-TM1</htmlTabRef>
+  <htmlTabName>2.6 Ghz TDD LTE 2x2 TM1</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+
+111111
+100000
+010000
+030101
+010001
+000001
+050000
+050001
+070000
+070001
+010010
+010002
+030201
+
+</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-enb</images_to_pull>
+  </testCase>
+
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase id="030101">
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="000001">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <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>
+  </testCase>
+
+  <testCase id="050000">
+    <class>Ping</class>
+    <desc>Ping: 20 pings</desc>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>60</ping_rttavg_threshold>
+  </testCase>
+
+ <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</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>60</ping_rttavg_threshold>
+   </testCase>
+
+  <testCase id="070000">
+    <class>Iperf</class>
+    <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>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
+   </testCase>
+
+   <testCase id="070001">
+     <class>Iperf</class>
+     <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>
+     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+     <iperf_profile>single-ue</iperf_profile>
+   </testCase>
+
+  <testCase id="010010">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="030201">
+    <class>Undeploy_Object</class>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+    <!-- <d_retx_th>1,100,100,100</d_retx_th>
+	    <u_retx_th>1,100,100,100</u_retx_th>
+		    ?
+    -->
+  </testCase>
+
+</testCaseList>
+
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -0,0 +1,160 @@
+<!--
+
+ 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-LTE-2x2-N3XXi-TM2</htmlTabRef>
+  <htmlTabName>2.6 Ghz TDD LTE 2x2 TM2</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+
+111111
+100000
+010000
+030101
+010001
+000001
+050000
+050001
+070000
+070001
+010010
+010002
+030201
+
+</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-enb</images_to_pull>
+  </testCase>
+
+  <testCase id="100000">
+    <class>Custom_Command</class>
+    <desc>Disable Sleep States</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -D 0</command>
+  </testCase>
+
+  <testCase id="200000">
+    <class>Custom_Command</class>
+    <desc>Enable Sleep States</desc>
+    <node>obelix</node>
+    <command>sudo cpupower idle-set -E</command>
+  </testCase>
+
+  <testCase id="030101">
+    <class>Deploy_Object</class>
+    <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="000001">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <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>
+  </testCase>
+
+  <testCase id="050000">
+    <class>Ping</class>
+    <desc>Ping: 20 pings</desc>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>60</ping_rttavg_threshold>
+  </testCase>
+
+ <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</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>60</ping_rttavg_threshold>
+   </testCase>
+
+  <testCase id="070000">
+    <class>Iperf</class>
+    <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>
+    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+    <iperf_profile>single-ue</iperf_profile>
+   </testCase>
+
+   <testCase id="070001">
+     <class>Iperf</class>
+     <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>
+     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
+     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
+     <iperf_profile>single-ue</iperf_profile>
+   </testCase>
+
+  <testCase id="010010">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="030201">
+    <class>Undeploy_Object</class>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+    <!-- <d_retx_th>1,100,100,100</d_retx_th>
+	    <u_retx_th>1,100,100,100</u_retx_th>
+		    ?
+    -->
+  </testCase>
+
+</testCaseList>
+
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -86,14 +86,14 @@
 	</testCase>
 	<testCase id="500000">
 		<class>Custom_Command</class>
-		<desc>Disable Sleep States (obelix)</desc>
-		<node>obelix</node>
+		<desc>Disable Sleep States (ofqot)</desc>
+		<node>ofqot</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
 	<testCase id="600000">
 		<class>Custom_Command</class>
-		<desc>Enable Sleep States (obelix)</desc>
-		<node>obelix</node>
+		<desc>Enable Sleep States (ofqot)</desc>
+		<node>ofqot</node>
 		<command>sudo cpupower idle-set -E</command>
 	</testCase>

@@ -185,8 +185,8 @@

 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/125Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 125M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 90M -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_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -0,0 +1,122 @@
+<!--
+
+ 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-5G-AW2S</htmlTabRef>
+  <htmlTabName>20 MHz TDD SA</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <repeatCount>1</repeatCount>
+  <TestCaseRequestedList>
+    010000
+    001000
+    020000
+    002000
+    002002
+    000100
+    000200
+    003000
+    004000
+    000002
+    030000
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="010000">
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images_to_pull>oai-gnb-aw2s</images_to_pull>
+  </testCase>
+
+  <testCase id="020000">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="001000">
+    <class>Initialize_UE</class>
+    <desc>Initialize Amarisoft UE</desc>
+    <id>amarisoft_ue</id>
+  </testCase>
+
+  <testCase id="002000">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_1</id>
+  </testCase>
+
+  <testCase id="002002">
+    <class>Attach_UE</class>
+    <desc>Attach UE</desc>
+    <id>amarisoft_ue_2</id>
+  </testCase>
+
+  <testCase id="000100">
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase id="000200">
+    <class>Ping</class>
+    <desc>Ping: 100pings in 20sec</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>15</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase id="003000">
+    <class>Detach_UE</class>
+    <desc>Detach UE</desc>
+    <id>amarisoft_ue_1 amarisoft_ue_2</id>
+  </testCase>
+
+  <testCase id="004000">
+    <class>Terminate_UE</class>
+    <desc>Terminate UE</desc>
+    <id>amarisoft_ue</id>
+  </testCase>
+
+  <testCase id="000002">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+  </testCase>
+
+  <testCase id="030000">
+    <class>Undeploy_Object</class>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</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_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
  <htmlTabRef>TEST-SA-FR1-B200</htmlTabRef>
-  <htmlTabName>40 MHz TDD SA</htmlTabName>
+  <htmlTabName>20 MHz TDD SA</htmlTabName>
  <htmlTabIcon>tasks</htmlTabIcon>
  <repeatCount>1</repeatCount>
  <TestCaseRequestedList>
@@ -36,6 +36,10 @@
    070000
    070001
    070002
+    060001
+    000002
+    060002
+    050000
    010010
    010002
    030201
@@ -53,13 +57,13 @@
  <testCase id="100000">
    <class>Custom_Command</class>
    <desc>Disable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
    <command>sudo cpupower idle-set -D 0</command>
  </testCase>
  <testCase id="200000">
    <class>Custom_Command</class>
    <desc>Enable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
    <command>sudo cpupower idle-set -E</command>
  </testCase>

@@ -136,8 +140,8 @@

  <testCase id="070001">
    <class>Iperf</class>
-    <desc>iperf (UL/8Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 8M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (UL/3.5Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 3.5M -t 30 -i 1 -fm</iperf_args>
    <direction>UL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>1</iperf_packetloss_threshold>
@@ -154,6 +158,21 @@
    <iperf_profile>single-ue</iperf_profile>
  </testCase>

+  <testCase id="060001">
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment</desc>
+    <node>ofqot</node>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+  <testCase id="060002">
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment</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 reconf_after_reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
  <testCase id="030201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -93,13 +93,13 @@
  <testCase id="100000">
    <class>Custom_Command</class>
    <desc>Disable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
    <command>sudo cpupower idle-set -D 0</command>
  </testCase>
  <testCase id="200000">
    <class>Custom_Command</class>
    <desc>Enable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
    <command>sudo cpupower idle-set -E</command>
  </testCase>

--- a/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_b200.xml
@@ -42,7 +42,7 @@
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE</desc>
 		<air_interface>nr</air_interface>
-		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "serial=30C51D1" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 -E --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "serial=30C51D1" --numerology 1 -r 106 --band 78 -C 3319680000 --ue-txgain 0 -E --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 	</testCase>

 	<testCase id="010002">
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -44,7 +44,7 @@
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE (N310)</desc>
 		<air_interface>nr</air_interface>
-		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=172.21.19.13,addr=192.168.10.2"  --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=172.21.19.13,addr=192.168.10.2"  --numerology 1 -r 106 --band 78 -C 3319680000 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 	</testCase>

 	<testCase id="010002">
--- a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
@@ -42,7 +42,7 @@
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE (X300)</desc>
 		<air_interface>nr</air_interface>
-		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "addr=192.168.60.2"  --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "addr=192.168.60.2"  --numerology 1 -r 106 --band 78 -C 3319680000 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 	</testCase>

 	<testCase id="010002">
--- a/ci-scripts/xml_files/fr1_sa_quectel.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel.xml
@@ -166,8 +166,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_162prb.xml
@@ -119,8 +119,8 @@

 	<testCase id="072000">
 		<class>Iperf</class>
-		<desc>iperf (DL/200Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 200M -t 60</iperf_args>
+		<desc>iperf (DL/180Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 180M -t 60</iperf_args>
 		<direction>DL</direction>
 		<id>nrmodule2_quectel</id>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
@@ -155,8 +155,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages.xml
@@ -193,8 +193,8 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
-		<d_retx_th>5,50,100,100</d_retx_th>
-		<u_retx_th>5,50,100,100</u_retx_th>
+		<d_retx_th>5,80,100,100</d_retx_th>
+		<u_retx_th>5,80,100,100</u_retx_th>
 	</testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm1_quectel.xml
@@ -1,164 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>TEST-LTE-TM1-Tab1</htmlTabRef>
-	<htmlTabName>LTE 2x2 TM1 Ping DL UL with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 100000
- 010000 
- 030000
- 010001
- 050000
- 050001
- 070000
- 070001
- 010011
- 010002
- 080000
- 200000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="100000">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-	<testCase id="200000">
-		<class>Custom_Command</class>
-		<desc>Enable Sleep States</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -E</command>
-	</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 Quectel</desc>
-		<id>nrmodule2_quectel</id>
-	</testCase>
-	<testCase id="010011">
-		<class>Detach_UE</class>
-		<desc>Detach Quectel</desc>
-		<id>nrmodule2_quectel</id>
-	</testCase>
-
-	<testCase id="030000">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-		<eNB_Trace>yes</eNB_Trace>
-		<eNB_Stats>yes</eNB_Stats>
-		<USRP_IPAddress>172.21.19.13</USRP_IPAddress>
-	</testCase>
-
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050000">
-		<class>Ping</class>
-		<desc>Ping: 20 pings</desc>
-		<id>nrmodule2_quectel</id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>60</ping_rttavg_threshold>
-	</testCase>
-	<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</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>60</ping_rttavg_threshold>
-	</testCase>
-
-
-	<testCase id="070000">
-		<class>Iperf</class>
-		<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>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070001">
-		<class>Iperf</class>
-		<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>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="080001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
+++ b/ci-scripts/xml_files/lte_2x2_tm2_quectel.xml
@@ -1,164 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>TEST-LTE-TM2-Tab2</htmlTabRef>
-	<htmlTabName>LTE 2x2 TM2 Ping DL UL with QUECTEL</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>
- 100000
- 010000 
- 030001
- 010001
- 050002
- 050003
- 070002
- 070003
- 010011
- 010002
- 080000
- 200000
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="100000">
-		<class>Custom_Command</class>
-		<desc>Disable Sleep States</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -D 0</command>
-	</testCase>
-	<testCase id="200000">
-		<class>Custom_Command</class>
-		<desc>Enable Sleep States</desc>
-		<node>obelix</node>
-		<command>sudo cpupower idle-set -E</command>
-	</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 Quectel</desc>
-		<id>nrmodule2_quectel</id>
-	</testCase>
-	<testCase id="010011">
-		<class>Detach_UE</class>
-		<desc>Detach Quectel</desc>
-		<id>nrmodule2_quectel</id>
-	</testCase>
-
-	<testCase id="030001">
-		<class>Initialize_eNB</class>
-		<desc>Initialize eNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-		<eNB_Trace>yes</eNB_Trace>
-		<eNB_Stats>yes</eNB_Stats>
-		<USRP_IPAddress>172.21.19.13</USRP_IPAddress>
-	</testCase>
-
-
-	<testCase id="000001">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
-	</testCase>
-
-
-	<testCase id="050002">
-		<class>Ping</class>
-		<desc>Ping: 20 pings</desc>
-		<id>nrmodule2_quectel</id>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>60</ping_rttavg_threshold>
-	</testCase>
-	<testCase id="050003">
-		<class>Ping</class>
-		<desc>Ping: 100 pings, size 1024</desc>
-		<id>nrmodule2_quectel</id>
-		<ping_args>-c 100 -s 1024 -i 0,2</ping_args>
-		<ping_packetloss_threshold>1</ping_packetloss_threshold>
-		<ping_rttavg_threshold>60</ping_rttavg_threshold>
-	</testCase>
-
-
-	<testCase id="070002">
-		<class>Iperf</class>
-		<desc>iperf (DL/1Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 1M -t 60</iperf_args>
-		<direction>DL</direction>
-		<id>nrmodule2_quectel</id>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="070003">
-		<class>Iperf</class>
-		<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>
-		<iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-		<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-
-
-
-	<testCase id="080000">
-		<class>Terminate_eNB</class>
-		<desc>Terminate eNB</desc>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-		<air_interface>lte</air_interface>
-	</testCase>
-
-	<testCase id="080001">
-		<class>Terminate_eNB</class>
-		<desc>Terminate gNB</desc>
-		<eNB_instance>1</eNB_instance>
-		<eNB_serverId>1</eNB_serverId>
-		<air_interface>nr</air_interface>
-	</testCase>
-
-</testCaseList>
-
--- a/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml
+++ b/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml
@@ -34,7 +34,7 @@
 	<testCase id="090110">
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE -- sniffing Orange frequency</desc>
-		<Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 135 --ue-scan-carrier --no-L2-connect --nokrnmod 1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 135 --ue-scan-carrier --no-L2-connect --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 	</testCase>

 	<testCase id="000001">
--- a/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml
+++ b/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml
@@ -34,7 +34,7 @@
 	<testCase id="090111">
 		<class>Initialize_OAI_UE</class>
 		<desc>Initialize OAI UE -- sniffing SFR frequency</desc>
-		<Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 130 --ue-scan-carrier --no-L2-connect --nokrnmod 1 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 130 --ue-scan-carrier --no-L2-connect --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 	</testCase>

 	<testCase id="000001">
--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -248,7 +248,7 @@ services:
            UE_NFAPI_IF_NAME: eno1
            ENB_IP_ADDRESS: 127.0.0.1
            LTE_UE_IP_ADDRESS: 127.0.0.1
-            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --nokrnmod 1 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 2 --log_config.global_log_options level,nocolor,time
        volumes:
            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
        healthcheck:
@@ -276,7 +276,7 @@ services:
            UE_NFAPI_IF_NAME: eno1
            ENB_IP_ADDRESS: 127.0.0.1
            LTE_UE_IP_ADDRESS: 127.0.0.1
-            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --nokrnmod 1 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --L2-emul 5 --num-ues 1 --node-number 3 --log_config.global_log_options level,nocolor,time
        volumes:
            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
        healthcheck:
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -233,7 +233,7 @@ services:
            OPC: 'c42449363bbad02b66d16bc975d77cc1'
            MSISDN: '001011234561010'
            HPLMN: 20896
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
@@ -55,7 +55,7 @@ services:
            OPC: 'c42449363bbad02b66d16bc975d77cc1'
            MSISDN: '001011234561010'
            HPLMN: 20896
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time --noS1
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -233,7 +233,7 @@ services:
            OPC: 'c42449363bbad02b66d16bc975d77cc1'
            MSISDN: '001011234561010'
            HPLMN: 20896
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -233,7 +233,7 @@ services:
            OPC: 'c42449363bbad02b66d16bc975d77cc1'
            MSISDN: '001011234561010'
            HPLMN: 20896
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -39,7 +39,7 @@ services:
            OPC: 'e734f8734007d6c5ce7a0508809e7e9c'
            MSISDN: '33611123456'
            HPLMN: 20893
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
@@ -43,7 +43,7 @@ services:
            OPC: 'e734f8734007d6c5ce7a0508809e7e9c'
            MSISDN: '33611123456'
            HPLMN: 20893
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --log_config.global_log_options level,nocolor,time --noS1
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -232,7 +232,7 @@ services:
            OPC: 'c42449363bbad02b66d16bc975d77cc1'
            MSISDN: '001011234561010'
            HPLMN: 20896
-            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --nokrnmod 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --log_config.global_log_options level,nocolor,time
        healthcheck:
            test: /bin/bash -c "pgrep lte-uesoftmodem"
            interval: 10s
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -241,7 +241,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-du
        networks:
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -202,7 +202,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -228,7 +228,7 @@ services:
            NR_UE_NFAPI_IF_NAME: eno1
            GNB_IP_ADDRESS: 127.0.0.1
            NR_UE_IP_ADDRESS: 127.0.0.1
-            USE_ADDITIONAL_OPTIONS: --nokrnmod 1  --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
+            USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
        volumes:
            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
        depends_on:
--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -250,7 +250,7 @@ Create entry for Second UE in docker-compose.yaml file as follows:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -203,7 +203,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
@@ -226,7 +226,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -193,7 +193,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -194,7 +194,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --nokrnmod --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -239,7 +239,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-du
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
        environment:
            RFSIMULATOR: server
            USE_VOLUMED_CONF: 'yes'
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
        networks:
            public_net:
                ipv4_address: 192.168.71.140
@@ -31,7 +31,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --nokrnmod --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
        volumes:
          - rrc.config:/opt/oai-nr-ue/etc/rrc/
        depends_on:
--- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
        environment:
            RFSIMULATOR: server
            USE_VOLUMED_CONF: 'yes'
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
        networks:
            public_net:
                ipv4_address: 192.168.71.140
@@ -31,7 +31,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
        volumes:
          - rrc.config:/opt/oai-nr-ue/etc/rrc/
        depends_on:
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
        environment:
            RFSIMULATOR: server
            USE_VOLUMED_CONF: 'yes'
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
        networks:
            public_net:
                ipv4_address: 192.168.71.140
@@ -31,7 +31,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
        volumes:
          - rrc.config:/opt/oai-nr-ue/etc/rrc/
        depends_on:
--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -194,7 +194,7 @@ services:
            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
            DNN: oai
            NSSAI_SST: 1
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --nokrnmod --nokrnmod --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3.8'
+services:
+    oai-enb:
+        image: oai-enb:latest
+        privileged: true
+        container_name: oai-enb
+        environment:
+            TZ: Europe/Paris
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6
+        volumes:
+            - ../../conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf:/opt/oai-enb/etc/mounted.conf
+        network_mode: "host"
+        healthcheck:
+            test: /bin/bash -c "pgrep lte-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3.8'
+services:
+    oai-enb:
+        image: oai-enb:latest
+        privileged: true
+        container_name: oai-enb
+        environment:
+            TZ: Europe/Paris
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6
+        volumes:
+            - ../../conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf:/opt/oai-enb/etc/mounted.conf
+        network_mode: "host"
+        healthcheck:
+            test: /bin/bash -c "pgrep lte-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
--- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
@@ -20,7 +20,7 @@ services:
            NB_PRB: 25
            ENABLE_MEASUREMENT_REPORTS: 'yes'
            ENABLE_X2: 'yes'
-            MME_S1C_IP_ADDRESS: 172.21.16.136
+            MME_S1C_IP_ADDRESS: 172.21.16.137
            ENB_S1C_IF_NAME: eth0
            ENB_S1C_IP_ADDRESS: 192.168.68.130
            ENB_S1U_IF_NAME: eth0
--- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
@@ -15,7 +15,7 @@ services:
            TAC: 1
            ENABLE_X2: 'yes'
            ENB_X2_IP_ADDRESS: 192.168.68.130
-            MME_S1C_IP_ADDRESS: 172.21.16.136
+            MME_S1C_IP_ADDRESS: 172.21.16.137
            GNB_S1C_IF_NAME: eth0
            GNB_S1C_IP_ADDRESS: 192.168.68.194
            GNB_S1U_IF_NAME: eth0
--- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3.8'
+services:
+    oai-gnb:
+        image: oai-gnb-aw2s:latest
+        privileged: true
+        network_mode: "host"
+        container_name: oai-gnb-aw2s
+        environment:
+            TZ: Europe/Paris
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa
+        volumes:
+            - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/mounted.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
--- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
@@ -15,12 +15,12 @@ services:
            TAC: 1
            NSSAI_SST: 1
            NSSAI_SD0: 1
-            AMF_IP_ADDRESS: 172.21.16.136
+            AMF_IP_ADDRESS: 172.21.16.137
            GNB_NGA_IF_NAME: eth0
            GNB_NGA_IP_ADDRESS: 192.168.68.194
            GNB_NGU_IF_NAME: eth0
            GNB_NGU_IP_ADDRESS: 192.168.68.194
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - /dev:/dev
        networks:
--- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
@@ -16,7 +16,7 @@ services:
            NSSAI_SST: 1
            NSSAI_SD0: 1
            NSSAI_SD1: 2
-            AMF_IP_ADDRESS: 172.21.16.136
+            AMF_IP_ADDRESS: 172.21.16.137
            GNB_NGA_IF_NAME: eth0
            GNB_NGA_IP_ADDRESS: 192.168.68.194
            GNB_NGU_IF_NAME: eth0
--- a/cmake_targets/at_commands/CMakeLists.txt
+++ b/cmake_targets/at_commands/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)

 #
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat ")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")

--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -289,11 +289,13 @@
                                    (Test10: Format 2 9-bit 2/106 PRB),
                                    (Test11: Format 2 10-bit 2/106 PRB),
                                    (Test12: Format 2 11-bit 2/106 PRB),
-                                    (Test13: Format 2 12-bit 8/106 PRB),
-                                    (Test14: Format 2 19-bit 8/106 PRB),
-                                    (Test15: Format 2 32-bit 8/106 PRB),
-                                    (Test16: Format 2 32-bit 16/106 PRB),
-                                    (Test17: Format 2 64-bit 16/106 PRB)</desc>
+                                    (Test13: Format 2 12-bit 4/106 PRB),
+                                    (Test14: Format 2 19-bit 4/106 PRB),
+                                    (Test15: Format 2 12-bit 8/106 PRB),
+                                    (Test16: Format 2 19-bit 8/106 PRB),
+                                    (Test17: Format 2 32-bit 8/106 PRB),
+                                    (Test18: Format 2 32-bit 16/106 PRB),
+                                    (Test19: Format 2 64-bit 16/106 PRB)</desc>
      <main_exec>nr_pucchsim</main_exec>
      <main_exec_args>-R 106 -i 1 -P 0 -b 1 -s-2 -n1000
                      -R 106 -i 1 -P 0 -b 2 -s-2 -n1000
@@ -307,12 +309,14 @@
                      -R 106 -i 1 -P 2 -b 9 -s5 -n1000
                      -R 106 -i 1 -P 2 -b 10 -s6 -n1000
                      -R 106 -i 1 -P 2 -b 11 -s6 -n1000
+                      -R 106 -i 1 -P 2 -q4 -b 12 -s-3 -n1000
+                      -R 106 -i 1 -P 2 -q4 -b 19 -s-3 -n1000
                      -R 106 -i 1 -P 2 -q8 -b 12 -s-3 -n1000
                      -R 106 -i 1 -P 2 -q8 -b 19 -s-3 -n1000
                      -R 106 -i 1 -P 2 -q8 -b 32 -s-3 -n1000
                      -R 106 -i 1 -P 2 -q16 -b 32 -s-3 -n1000
                      -R 106 -i 1 -P 2 -q16 -b 64 -s-3 -n1000</main_exec_args>
-      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17</tags>
+      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19</tags>
      <search_expr_true>PUCCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
@@ -354,18 +358,21 @@
      <desc>nr_ulsim Test cases. (Test1: MCS 9 106 PRBs),
                                 (Test2: MCS 16 50 PRBs),
                                 (Test3: MCS 28 50 PRBs),
-                                 (Test4: MCS 9 217 PRBs),
-                                 (Test5: MCS 9 273 PRBs),
-                                 (Test6: PUSCH Type A, 2 DMRS Symbols),
-                                 (Test7: PUSCH Type A, 3 DMRS, 4 PTRS, 5 Interpolated Symbols),
-                                 (Test8: PUSCH Type B, 3 DMRS, 2 PTRS, 7 Interpolated Symbols),
-                                 (Test9: PUSCH Type B, 3 DMRS, 2 PTRS, 3 Interpolated Symbols),
-                                 (Test10: 25 PRBs, 15 kHz SCS),
-                                 (Test11: MCS 0, low SNR performance)</desc>
+                                 (Test4: MCS 27 50 PRBs 256QAM),
+                                 (Test5: MCS 9 217 PRBs),
+                                 (Test6: MCS 9 273 PRBs),
+                                 (Test7: PUSCH Type A, 2 DMRS Symbols),
+                                 (Test8: PUSCH Type A, 3 DMRS, 4 PTRS, 5 Interpolated Symbols),
+                                 (Test9: PUSCH Type B, 3 DMRS, 2 PTRS, 7 Interpolated Symbols),
+                                 (Test10: PUSCH Type B, 3 DMRS, 2 PTRS, 3 Interpolated Symbols),
+                                 (Test11: 25 PRBs, 15 kHz SCS),
+                                 (Test12: MCS 0, low SNR performance)
+                                 (Test13: MCS 28, 106 PRBs, Time shift 8)</desc>
      <main_exec>nr_ulsim</main_exec>
      <main_exec_args>-n100 -m9 -r106 -s5
                      -n100 -m16 -s10
                      -n100 -m28 -s20
+                      -n100 -m27 -s25 -q1
                      -n100 -m9 -R217 -r217 -s5
                      -n100 -m9 -R273 -r273 -s5
                      -n100 -s5 -U 0,1,1,1
@@ -373,8 +380,9 @@
                      -n100 -s5 -T 2,2 -U 1,2,1,1
                      -n100 -s5 -a4 -b8 -T 1,2 -U 1,3,1,1
                      -n100 -u0 -m0 -R25 -r25 -i 1,0
-                      -n100 -m0 -S -0.6 -i 1,0</main_exec_args>
-      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11</tags>
+                      -n100 -m0 -S -0.6 -i 1,0
+                      -n100 -m 28 -R106 -r106 -t90 -s24 -S24 -d 8</main_exec_args>
+      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13</tags>
      <search_expr_true>PUSCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
@@ -440,7 +448,11 @@
                                 (Test21: 3GPP G-FR1-A5-13, PUSCH Type B, 40 MHz BW, 30 kHz SCS, 8 RX Antennas Requirements Test),
                                 (Test22: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 2 RX Antennas Requirements Test),
                                 (Test23: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 4 RX Antennas Requirements Test),
-                                 (Test24: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 8 RX Antennas Requirements Test)</desc>
+                                 (Test24: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 8 RX Antennas Requirements Test),
+                                 (Test25: 3GPP G-FR1-A3-27, PUSCH Type B, 40 MHz BW, 30 kHz SCS, 2 RX Antennas Requirements Test, 2 layers),
+                                 (Test26: 3GPP G-FR1-A3-27, PUSCH Type B, 40 MHz BW, 30 kHz SCS, 4 RX Antennas Requirements Test, 2 layers),
+                                 (Test27: 3GPP G-FR1-A4-27, PUSCH Type B, 40 MHz BW, 30 kHz SCS, 2 RX Antennas Requirements Test, 2 layers),
+                                 (Test28: 3GPP G-FR1-A4-27, PUSCH Type B, 40 MHz BW, 30 kHz SCS, 4 RX Antennas Requirements Test, 2 layers)</desc>
      <main_exec>nr_ulsim</main_exec>
      <main_exec_args>-n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z2 -s12.4 -S12.4
                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z4 -s8.5 -S8.5
@@ -465,8 +477,12 @@
                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z8 -s5.5 -S5.5
                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z2 -s13.1 -S13.1
                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z4 -s9.2 -S9.2
-                      -n100 -b14 -I8 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z8 -s5.9 -S5.9</main_exec_args>
-      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22 test23 test24</tags>
+                      -n100 -b14 -I8 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z8 -s5.9 -S5.9
+                      -n100 -b14 -I15 -i 0,1 -g B,l -t70 -u 1 -m2 -R106 -r106 -U 1,1,1,2 -W2 -y2 -z2 -s1.7 -S1.7
+                      -n100 -b14 -I15 -i 0,1 -g B,l -t70 -u 1 -m2 -R106 -r106 -U 1,1,1,2 -W2 -y2 -z4 -s-2.1 -S-2.1
+                      -n100 -b14 -I15 -i 0,1 -g C,l -t70 -u 1 -m16 -R106 -r106 -U 1,1,1,2 -W2 -y2 -z2 -s18.7 -S18.7
+                      -n100 -b14 -I15 -i 0,1 -g C,l -t70 -u 1 -m16 -R106 -r106 -U 1,1,1,2 -W2 -y2 -z4 -s11.2 -S11.2</main_exec_args>
+      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22 test23 test24 test25 test26 test27 test28</tags>
      <search_expr_true>PUSCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -56,7 +56,7 @@ CMAKE_CMD="$CMAKE"
 MAKE_CMD=make
 BUILD_ECLIPSE=0
 NR="False"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv oai_iqplayer"
 RU=0
 CMAKE_C_FLAGS=()
 CMAKE_CXX_FLAGS=()
@@ -300,10 +300,6 @@ function main() {
            SIMUS_PHY=1
            echo_info "Will compile dlsim, ulsim, ..."
            shift;;
-       -S | --core_simulators)
-            SIMUS_CORE=1
-            echo_info "Will compile security unitary tests"
-            shift;;
       -s | --check)
            OAI_TEST=1
            echo_info "Will run auto-tests"
@@ -466,17 +462,6 @@ function main() {

  cecho "OPENAIR_DIR    = $OPENAIR_DIR" $green

-  # for conf files copy in this bash script
-  if [ -d /usr/lib/freeDiameter ]; then
-    export FREEDIAMETER_PREFIX=/usr
-  else
-    if [ -d /usr/local/lib/freeDiameter ]; then
-      export FREEDIAMETER_PREFIX=/usr/local
-    else
-      echo_warning "FreeDiameter prefix not found, install freeDiameter if EPC, HSS"
-    fi
-  fi
-
  if [ "$CLEAN_ALL" = "1" ] ; then
    clean_all_files
    echo_info "Erased all previously producted files"
@@ -517,25 +502,15 @@ function main() {
  fi

  execlist=""
-  if [ "$eNB" = "1" ] ; then
-      execlist="$execlist lte-softmodem"
-  fi
-  if [ "$gNB" = "1" ] ; then
-      execlist="$execlist nr-softmodem nr-cuup"
-  fi
-  if [ "$RU" = "1" ] ; then
-      execlist="$execlist oairu"
-  fi
-  if [ "$UE" = 1 ] ; then
-      execlist="$execlist lte-uesoftmodem"
-  fi
-  if [ "$nrUE" = 1 ] ; then
-      execlist="$execlist nr-uesoftmodem"
-  fi
-
-  if [[ "$execlist" == "" && "$SIMUS_PHY" != "1" && "$HW" == "None" ]]; then
-    SKIP_SHARED_LIB_FLAG="True"
-  fi
+  [[ "$eNB" == "1" ]] && execlist="$execlist lte-softmodem"
+  [[ "$gNB" == "1" ]] && execlist="$execlist nr-softmodem nr-cuup"
+  [[ "$RU" == "1" ]] &&  execlist="$execlist oairu"
+  [[ "$UE" == 1 ]] &&    execlist="$execlist lte-uesoftmodem"
+  [[ "$nrUE" == 1 ]] &&  execlist="$execlist nr-uesoftmodem"
+  # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
+  [[ "$SIMUS_PHY" == "1" ]] && execlist="$execlist dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
+  [[ "$BUILD_OPTLIB" != "" ]] && execlist="$execlist $BUILD_OPTLIB"
+  [[ "$execlist" != "" ]] && execlist="$execlist params_libconfig coding rfsimulator"

  DIR=$OPENAIR_DIR/cmake_targets

@@ -552,34 +527,19 @@ function main() {
  echo_info "running $CMAKE_CMD"
  eval $CMAKE_CMD
  
-  for f in $execlist ; do
-      echo_info "Compiling $f..."
-      compilations $BUILD_DIR $f
-  done
-  
-  
-  # mandatory shared libraries common to UE and (e/g)NB
-  
-  if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
-      echo_info "Building shared libraries common to UE and gNB"
-
-      # configuration module libraries, one currently available, using libconfig
-      config_libconfig_shlib=params_libconfig
-      
-      compilations $BUILD_DIR $config_libconfig_shlib
-      
-      compilations $BUILD_DIR coding
-      
+  if [[ "$execlist" != "" ]]; then
+    echo_info "Compiling $execlist..."
+    compilations $BUILD_DIR all.txt $execlist
  fi
  
  if [ "$UE" = 1 ] ; then

    echo_info "Compiling UE specific part"

-    if [ $UE_ip -eq 1 ]
+    if [ "$UE_ip" = 1 ]
    then
      echo_info "Building ue_ip module"
-      compilations $BUILD_DIR ue_ip
+      compilations $BUILD_DIR ue_ip.txt ue_ip
    else
      echo_info "Bypassing ue_ip build"
    fi #IS_CONTAINER
@@ -594,9 +554,9 @@ function main() {
    cd $DIR/nas_sim_tools/build

    eval $CMAKE_CMD ..
-    compilations nas_sim_tools usim
-    compilations nas_sim_tools nvram
-    compilations nas_sim_tools conf2uedata
+    compilations nas_sim_tools usim.txt usim
+    compilations nas_sim_tools nvram.txt nvram
+    compilations nas_sim_tools conf2uedata.txt conf2uedata

    # generate USIM data
    if [ -f conf2uedata ]; then
@@ -606,42 +566,6 @@ function main() {
    fi
  fi

-  cd  $DIR/$BUILD_DIR/build
-  
-  ##################
-  # PHY simulators #
-  ##################
-  if [ "$SIMUS_PHY" = "1" ] ; then
-    echo_info "Compiling physical unitary tests simulators"
-    # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-    simlist="dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
-	# simlist="ldpctest"
-    for f in $simlist ; do
-      compilations $BUILD_DIR $f
-    done
-    compilations $BUILD_DIR coding
-  fi
-
-  ###################
-  # Core simulators #
-  ###################
-  if [ "$SIMUS_CORE" = "1" ] ; then
-    echo_info "Compiling security unitary tests simulators"
-    simlist="secu_knas_encrypt_eia1 secu_kenb aes128_ctr_encrypt aes128_ctr_decrypt secu_knas_encrypt_eea2 secu_knas secu_knas_encrypt_eea1 kdf aes128_cmac_encrypt secu_knas_encrypt_eia2"
-    for f in $simlist ; do
-      compilations $BUILD_DIR test_$f
-    done
-  fi
-  
-  ######################
-  # Optional libraries #
-  ######################
-  if [ ! -z "$BUILD_OPTLIB" ] ; then 
-     for oklib in $BUILD_OPTLIB ; do
-         compilations $BUILD_DIR $oklib
-     done
-  fi
-
  ####################################################
  # Build RF device and transport protocol libraries #
  ####################################################
@@ -652,31 +576,31 @@ function main() {
          rm -f liboai_device.so

          if [ "$HW" == "OAI_USRP" ] ; then
-              compilations $BUILD_DIR oai_usrpdevif
+              compilations $BUILD_DIR oai_usrpdevif.txt oai_usrpdevif

              ln -sf liboai_usrpdevif.so liboai_device.so
              echo_info "liboai_device.so is linked to USRP device library"        
          elif [ "$HW" == "OAI_BLADERF" ] ; then
              if [ -f "/usr/include/libbladeRF.h" ] ; then
-                  compilations $BUILD_DIR oai_bladerfdevif
+                  compilations $BUILD_DIR oai_bladerfdevif.txt oai_bladerfdevif
              fi

              ln -sf liboai_bladerfdevif.so liboai_device.so
              echo_info "liboai_device.so is linked to BLADERF device library"	 
          elif [ "$HW" == "OAI_LMSSDR" ] ; then
 #              if [ -f "/usr/include/libbladeRF.h" ] ; then
-                  compilations $BUILD_DIR oai_lmssdrdevif
+                  compilations $BUILD_DIR oai_lmssdrdevif.txt oai_lmssdrdevif
 #              fi

              ln -sf liboai_lmssdrdevif.so liboai_device.so
              echo_info "liboai_device.so is linked to LMSSDR device library"	 
          elif [ "$HW" == "OAI_IRIS" ] ; then
-              compilations $BUILD_DIR oai_irisdevif
+              compilations $BUILD_DIR oai_irisdevif.txt oai_irisdevif

              ln -s liboai_irisdevif.so liboai_device.so
              echo_info "liboai_device.so is linked to IRIS device library"
          elif [ "$HW" == "OAI_AW2SORI" ] ; then
-              compilations $BUILD_DIR aw2sori_transpro
+              compilations $BUILD_DIR aw2sori_transpro.txt aw2sori_transpro

              ln -sf libaw2sori_transpro.so libthirdparty_transpro.so
              echo_info "build libthirdparty_transpro.so for AW2SORI fronthaul"
@@ -685,28 +609,22 @@ function main() {
          fi
      fi

-      #build simulators devices
-      if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
-          echo_info "Compiling rfsimulator"
-          compilations $BUILD_DIR rfsimulator
-      fi
-
      #build transport protocol libraries (currently only ETHERNET is available)
      if [ "$SKIP_SHARED_LIB_FLAG" = "False" ]; then
          echo_info "Building transport protocol libraries"
          rm -f liboai_transpro.so
 	  if [ "$TP" == "Ethernet" ]; then
-              compilations $BUILD_DIR oai_eth_transpro
+              compilations $BUILD_DIR oai_eth_transpro.txt oai_eth_transpro
              ln -sf liboai_eth_transpro.so liboai_transpro.so
              echo_info "liboai_transpro.so is linked to ETHERNET transport"
 	  fi
 	  if [ "$TP" == "benetel4g" ]; then
-              compilations $BUILD_DIR benetel_4g
+              compilations $BUILD_DIR benetel_4g.txt benetel4g
              ln -sf libbenetel_4g.so liboai_transpro.so
              echo_info "liboai_transpro.so is linked to BENETEL4G transport"
 	  fi
 	  if [ "$TP" == "benetel5g" ]; then
-              compilations $BUILD_DIR benetel_5g
+              compilations $BUILD_DIR benetel_5g.txt benetel_5g
              ln -sf libbenetel_5g.so liboai_transpro.so
              echo_info "liboai_transpro.so is linked to BENETEL4G transport"
 	  fi
--- a/cmake_targets/macros.cmake
+++ b/cmake_targets/macros.cmake
@@ -55,7 +55,7 @@ macro(add_list2_option name val helpstr)
  endif()
  set(${name} ${value} CACHE STRING "${helpstr}")
  set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
-  if(NOT "${value}" STREQUAL "False")
+  if(NOT "${value}" STREQUAL "None")
    add_definitions("-D${value}=1")
  endif()
 endmacro(add_list2_option)
--- a/cmake_targets/nas_sim_tools/CMakeLists.txt
+++ b/cmake_targets/nas_sim_tools/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions(-std=gnu99)
 ENABLE_LANGUAGE(C)

 set(CMAKE_C_FLAGS
-  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -Werror -Wall -Wstrict-prototypes -Wno-packed-bitfield-compat -g")
+  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} -Werror -Wall -Wstrict-prototypes -g")

 set(OPENAIR_DIR     $ENV{OPENAIR_DIR})
 set(OPENAIR3_DIR    $ENV{OPENAIR_DIR}/openair3)
--- a/cmake_targets/tools/MODULES/FindFreeDiameter.cmake
+++ b/cmake_targets/tools/MODULES/FindFreeDiameter.cmake
@@ -1,89 +0,0 @@
-# - Find freediameter
-# Find the native FreeDiameter includes and libraries
-#
-#  FREEDIAMETER_FOUND - True if FreeDiameter found.
-#  FREEDIAMETER_INCLUDE_DIR - where to find gnutls.h, etc.
-#  FREEDIAMETER_LIBRARIES - List of libraries when using gnutls.
-#  FREEDIAMETER_HSS_S6A_ENABLED - true if FreeDiameter enabled for S6A interface 
-
-
-if (FREEDIAMETER_INCLUDE_DIR AND FREEDIAMETER_LIBRARIES)
-  set(FREEDIAMETER_FIND_QUIETLY TRUE)
-endif (FREEDIAMETER_INCLUDE_DIR AND FREEDIAMETER_LIBRARIES)
-
-# Include dir
-find_path(FREEDIAMETER_INCLUDE_DIR
-    NAMES
-    freeDiameter/freeDiameter-host.h
-    freeDiameter/libfdcore.h
-    freeDiameter/libfdproto.h
-)
-
-# Library
-find_library(FREEDIAMETER_LIBRARY 
-  NAMES fdcore
-)
-
-# handle the QUIETLY and REQUIRED arguments and set FREEDIAMETER_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEDIAMETER DEFAULT_MSG FREEDIAMETER_LIBRARY FREEDIAMETER_INCLUDE_DIR)
-
-IF(FREEDIAMETER_FOUND)
-  SET( FREEDIAMETER_LIBRARIES ${FREEDIAMETER_LIBRARY} )
-ELSE(FREEDIAMETER_FOUND)
-  SET( FREEDIAMETER_LIBRARIES )
-ENDIF(FREEDIAMETER_FOUND)
-
-find_library(FREEDIAMETER_LIBRARY2 
-  NAMES fdproto
-)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEDIAMETER2 DEFAULT_MSG FREEDIAMETER_LIBRARY2 FREEDIAMETER_INCLUDE_DIR)
-IF(FREEDIAMETER2_FOUND)
-  SET( FREEDIAMETER_LIBRARIES ${FREEDIAMETER_LIBRARIES} ${FREEDIAMETER_LIBRARY2} )
-ELSE(FREEDIAMETER2_FOUND)
-  SET( FREEDIAMETER_LIBRARIES )
-ENDIF(FREEDIAMETER2_FOUND)
-
-
-# Lastly make it so that the FREEDIAMETER_LIBRARY and FREEDIAMETER_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( FREEDIAMETER_LIBRARY FREEDIAMETER_INCLUDE_DIR )
-
-# Now check if the library is patched for OPENAIR HSS S6A.
-IF(FREEDIAMETER_FOUND)
-  IF( FREEDIAMETER_INCLUDE_DIR )
-    # Extract FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR from freeDiameter-host.h
-    # Read the whole file:
-    #
-    FILE(READ "${FREEDIAMETER_INCLUDE_DIR}/freeDiameter/freeDiameter-host.h" _freeDiameter_HOST_H_CONTENTS)
-
-    STRING(REGEX REPLACE ".*#define FD_PROJECT_VERSION_MAJOR ([0-9]+).*" "\\1" FD_PROJECT_VERSION_MAJOR "${_freeDiameter_HOST_H_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define FD_PROJECT_VERSION_MINOR ([0-9]+).*" "\\1" FD_PROJECT_VERSION_MINOR "${_freeDiameter_HOST_H_CONTENTS}")
-
-    IF(FD_PROJECT_VERSION_MAJOR GREATER 0)
-      MATH(EXPR FREEDIAMETER_VERSION_VALUE "${FD_PROJECT_VERSION_MAJOR} * 100 + ${FD_PROJECT_VERSION_MINOR} * 10")
-      SET(FREEDIAMETER_VERSION "${FREEDIAMETER_VERSION_VALUE}" CACHE INTERNAL "Freediameter release version")
-      MESSAGE(STATUS "freeDiameter version found ${FREEDIAMETER_VERSION}")
-    ENDIF(FD_PROJECT_VERSION_MAJOR GREATER 0)
-  ENDIF( FREEDIAMETER_INCLUDE_DIR )
-  GET_FILENAME_COMPONENT(FREEDIAMETER_PATH ${FREEDIAMETER_LIBRARY} PATH)
-  IF( NOT( "${FREEDIAMETER_VERSION_TEST_FOR}" STREQUAL "${FREEDIAMETER_LIBRARIES}" ))
-    INCLUDE (CheckLibraryExists) 
-    MESSAGE(STATUS "Checking freeDiameter patched for S6A")
-    UNSET(FREEDIAMETER_HSS_S6A_ENABLED)
-    UNSET(FREEDIAMETER_HSS_S6A_ENABLED CACHE)
-    UNSET(DICT_S6A_FOUND)
-    UNSET(DICT_S6A_FOUND CACHE)
-
-
-    FIND_FILE(DICT_S6A_FOUND NAMES dict_s6a.fdx PATHS ${FREEDIAMETER_PATH} ${FREEDIAMETER_PATH}/freeDiameter)
-    IF(DICT_S6A_FOUND)
-        SET( FREEDIAMETER_HSS_S6A_ENABLED TRUE CACHE INTERNAL "dict_s6a.fdx Found")
-    ELSE(DICT_S6A_FOUND)
-        SET( FREEDIAMETER_HSS_S6A_ENABLED FALSE CACHE INTERNAL "dict_s6a.fdx not Found")
-    ENDIF(DICT_S6A_FOUND)
-    SET( FREEDIAMETER_VERSION_TEST_FOR ${FREEDIAMETER_LIBRARIES} CACHE INTERNAL "Version the test was made against" )
-  ENDIF (NOT( "${FREEDIAMETER_VERSION_TEST_FOR}" STREQUAL "${FREEDIAMETER_LIBRARIES}" ))
-ENDIF(FREEDIAMETER_FOUND)
-
--- a/cmake_targets/tools/MODULES/FindMySQL.cmake
+++ b/cmake_targets/tools/MODULES/FindMySQL.cmake
@@ -1,55 +0,0 @@
-# - Find mysqlclient
-#
-# -*- cmake -*-
-#
-# Find the native MySQL includes and library
-#
-#  MySQL_INCLUDE_DIR - where to find mysql.h, etc.
-#  MySQL_LIBRARIES   - List of libraries when using MySQL.
-#  MySQL_FOUND       - True if MySQL found.
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  # Already in cache, be silent
-  SET(MySQL_FIND_QUIETLY TRUE)
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-
-# Include dir
-FIND_PATH(MySQL_INCLUDE_DIR 
-  NAMES mysql.h
-  PATH_SUFFIXES mysql
-)
-
-# Library
-#SET(MySQL_NAMES mysqlclient mysqlclient_r)
-SET(MySQL_NAMES mysqlclient)
-FIND_LIBRARY(MySQL_LIBRARY
-  NAMES ${MySQL_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  PATH_SUFFIXES mysql
-)
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  SET(MySQL_FOUND TRUE)
-  SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
-ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-  SET(MySQL_FOUND FALSE)
-  SET( MySQL_LIBRARIES )
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-
-
-IF (MySQL_FOUND)
-  IF (NOT MySQL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found MySQL: ${MySQL_LIBRARY}")
-  ENDIF (NOT MySQL_FIND_QUIETLY)
-ELSE (MySQL_FOUND)
-  IF (MySQL_FIND_REQUIRED)
-    MESSAGE(STATUS "Looked for MySQL libraries named ${MySQL_NAMES}.")
-    MESSAGE(FATAL_ERROR "Could NOT find MySQL library")
-  ENDIF (MySQL_FIND_REQUIRED)
-ENDIF (MySQL_FOUND)
-
-MARK_AS_ADVANCED(
-  MySQL_LIBRARY
-  MySQL_INCLUDE_DIR
-  )
-
--- a/cmake_targets/tools/MODULES/FindPostgreSQL.cmake
+++ b/cmake_targets/tools/MODULES/FindPostgreSQL.cmake
@@ -1,36 +0,0 @@
-# - Find PostgreSQL library
-#
-# This module defines:
-#  POSTGRESQL_FOUND - True if the package is found
-#  POSTGRESQL_INCLUDE_DIR - containing libpq-fe.h
-#  POSTGRESQL_LIBRARIES - Libraries to link to use PQ functions.
-
-if (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
-  set(POSTGRESQL_FIND_QUIETLY TRUE)
-endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
-
-# Include dir
-find_path(POSTGRESQL_INCLUDE_DIR 
-	NAMES libpq-fe.h
-	PATH_SUFFIXES pgsql postgresql
-)
-
-# Library
-find_library(POSTGRESQL_LIBRARY 
-  NAMES pq
-)
-
-# handle the QUIETLY and REQUIRED arguments and set POSTGRESQL_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(POSTGRESQL DEFAULT_MSG POSTGRESQL_LIBRARY POSTGRESQL_INCLUDE_DIR)
-
-IF(POSTGRESQL_FOUND)
-  SET( POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY} )
-ELSE(POSTGRESQL_FOUND)
-  SET( POSTGRESQL_LIBRARIES )
-ENDIF(POSTGRESQL_FOUND)
-
-# Lastly make it so that the POSTGRESQL_LIBRARY and POSTGRESQL_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( POSTGRESQL_LIBRARY POSTGRESQL_INCLUDE_DIR )
--- a/cmake_targets/tools/MODULES/path_prefixes.cmake
+++ b/cmake_targets/tools/MODULES/path_prefixes.cmake
@@ -1,264 +0,0 @@
-# Declare variables for path prefixes for different types of files.
-# NB: depends on 'multi_kernel' and 'uninstall_target'.
-
-# fill_install_prefixes(<project_name> <project_prefix>
-#     [BASE_INSTALL_PREFIX <base_install_prefix>]
-#     [KERNEL]
-# )
-#
-# Setup variables <project_prefix>_* to the install prefixes for
-# different project components.
-# Precisely, variables with next sufficies are set:
-#  INSTALL_PREFIX_EXEC - executables
-#  INSTALL_PREFIX_READONLY - readonly files
-#  INSTALL_PREFIX_GLOBAL_CONF - global configuration files
-#  INSTALL_PREFIX_PREFIX_LIB - libraries
-#  INSTALL_INCLUDE_DIR - include directory(for flags to compiler)
-#  INSTALL_PREFIX_INCLUDE - include files
-#  INSTALL_PREFIX_TEMP_SESSION - temporary files(exists until system restarts)
-#  INSTALL_PREFIX_TEMP - temporary files(preserved even when system restats)
-#  INSTALL_PREFIX_STATE - files which describe current state of the project.
-#  INSTALL_PREFIX_CACHE - cache files
-#  INSTALL_PREFIX_VAR - other modifiable files
-#  INSTALL_PREFIX_DOC - documentation files
-#  INSTALL_PREFIX_EXAMPLES - documentation files
-#
-# With 'KERNEL' option enabled paths for kernel-related files also set:
-#  INSTALL_KINCLUDE_DIR - directory for include when build kernel components
-#  INSTALL_PREFIX_KINCLUDE - include files for the kernel.
-#
-# Additionally, with 'KERNEL' option enabled, several variables are set to
-# paths, which contains "%kernel%" pattern.
-# These paths are intended for kernel-dependent files; for make paths
-# complete one should replace "%kernel%" substring with version of the
-# kernel.
-# Next kernel-dependend paths are set(sufficies only):
-#  KERNEL_INSTALL_PREFIX_KMODULE - directory for install kernel modules
-#  KERNEL_INSTALL_PREFIX_KSYMVERS - directory for install kernel modules' symvers files.
-#  KERNEL_INSTALL_INCLUDE_KERNEL_DIR - include directory with kernel-dependent headers.
-#  KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL - include files, which depends from kernel.
-#
-# Iff option 'COMMON_INSTALL_PREFIX' is given, all paths above are
-# calculated using <base_install_prefix> as base prefix.
-# Otherwise, CMAKE_INSTALL_PREFIX is used for that purpose.
-#
-# Additionally,
-#  INSTALL_TYPE
-# variable(suffix) is set to one of:
-#  - "GLOBAL_OPT" - install into "/opt",
-#  - "GLOBAL" - global installation except one into "/opt",
-#  - "LOCAL" - local installation.
-function(fill_install_prefixes project_name project_prefix)
-    cmake_parse_arguments(fip "KERNEL" "BASE_INSTALL_PREFIX" "" ${ARGN})
-    if(fip_UNPARSED_ARGUMENTS)
-    list(GET fip_UNPARSED_ARGUMENTS 0 exceeded_arg)
-    message(SEND_ERROR "Exceeded argument: ${exceeded_arg}")
-    endif(fip_UNPARSED_ARGUMENTS)
-    if(NOT fip_BASE_INSTALL_PREFIX)
-    set(fip_BASE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-    endif(NOT fip_BASE_INSTALL_PREFIX)
-
-    # Follow conventions about paths listed in
-    #   devel-docs/general/path_conventions.txt
-    # in kedr-devel package.
-
-    # Determine type of installation
-    if(fip_BASE_INSTALL_PREFIX MATCHES "^/opt")
-	set(fip_INSTALL_TYPE "GLOBAL_OPT")
-    elseif(fip_BASE_INSTALL_PREFIX MATCHES "^/usr"
-	OR fip_BASE_INSTALL_PREFIX STREQUAL "/"
-    )
-	set(fip_INSTALL_TYPE "GLOBAL")
-    else()
-	set(fip_INSTALL_TYPE "LOCAL")
-    endif()
-
-    # 1
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_EXEC "/opt/${project_name}/bin")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_EXEC "${fip_BASE_INSTALL_PREFIX}/bin")
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 2
-    set(fip_INSTALL_PREFIX_EXEC_AUX
-	"${fip_BASE_INSTALL_PREFIX}/lib/${project_name}"
-    )
-    # 3
-    set(fip_INSTALL_PREFIX_READONLY
-        "${fip_BASE_INSTALL_PREFIX}/share/${project_name}"
-    )
-    # 4
-    set(fip_INSTALL_PREFIX_MANPAGE
-        "${fip_BASE_INSTALL_PREFIX}/share/man"
-    )
-    # 5
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF "/etc/opt/${project_name}")
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF "/etc/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_GLOBAL_CONF
-	    "${fip_BASE_INSTALL_PREFIX}/etc/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 6
-    set(fip_INSTALL_PREFIX_LIB "${fip_BASE_INSTALL_PREFIX}/lib")
-    # 7
-    set(fip_INSTALL_PREFIX_LIB_AUX
-        "${fip_BASE_INSTALL_PREFIX}/lib/${project_name}"
-    )
-    # 8
-    set(fip_INSTALL_INCLUDE_DIR "${fip_BASE_INSTALL_PREFIX}/include")
-
-    set(fip_INSTALL_PREFIX_INCLUDE
-        "${fip_INSTALL_INCLUDE_DIR}/${project_name}"
-    )
-    # 9
-    set(fip_INSTALL_PREFIX_TEMP_SESSION "/tmp/${project_name}")
-    # 10
-    if(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_TEMP "/var/tmp/${project_name}")
-    else(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_TEMP
-            "${fip_BASE_INSTALL_PREFIX}/var/tmp/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE MATCHES "GLOBAL")
-    # 11
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-        set(fip_INSTALL_PREFIX_STATE
-	    "/var/opt/${project_name}/lib/${project_name}"
-	)
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-        set(fip_INSTALL_PREFIX_STATE "/var/lib/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_STATE
-	    "${fip_BASE_INSTALL_PREFIX}/var/lib/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 12
-    if(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-        set(fip_INSTALL_PREFIX_CACHE
-	    "/var/opt/${project_name}/cache/${project_name}"
-	)
-    elseif(fip_INSTALL_TYPE STREQUAL "GLOBAL")
-	set(fip_INSTALL_PREFIX_CACHE "/var/cache/${project_name}")
-    else(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-	set(fip_INSTALL_PREFIX_CACHE
-	    "${fip_BASE_INSTALL_PREFIX}/var/cache/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE STREQUAL "GLOBAL_OPT")
-    # 13
-    if(fip_INSTALL_TYPE MATCHES "GLOBAL")
-        set(fip_INSTALL_PREFIX_VAR "/var/opt/${project_name}")
-    else(fip_INSTALL_TYPE MATCHES "GLOBAL")
-	set(fip_INSTALL_PREFIX_VAR
-	    "${fip_BASE_INSTALL_PREFIX}/var/${project_name}"
-	)
-    endif(fip_INSTALL_TYPE MATCHES "GLOBAL")
-    # 14
-    set(fip_INSTALL_PREFIX_DOC
-	"${fip_BASE_INSTALL_PREFIX}/share/doc/${project_name}"
-    )
-
-    # Set derivative install path and prefixes
-
-    # additional, 4
-    set(fip_INSTALL_PREFIX_EXAMPLES
-    "${fip_INSTALL_PREFIX_READONLY}/examples")
-
-    # Export symbols to the outer scope
-    foreach(suffix
-	INSTALL_TYPE
-	INSTALL_PREFIX_EXEC
-	INSTALL_PREFIX_EXEC_AUX
-	INSTALL_PREFIX_READONLY
-	INSTALL_PREFIX_MANPAGE
-	INSTALL_PREFIX_GLOBAL_CONF
-	INSTALL_PREFIX_LIB
-	INSTALL_PREFIX_LIB_AUX
-	INSTALL_INCLUDE_DIR
-	INSTALL_PREFIX_INCLUDE
-	INSTALL_PREFIX_TEMP_SESSION
-	INSTALL_PREFIX_TEMP
-	INSTALL_PREFIX_STATE
-	INSTALL_PREFIX_CACHE
-	INSTALL_PREFIX_VAR
-	INSTALL_PREFIX_DOC
-	INSTALL_PREFIX_EXAMPLES
-    )
-	set(${project_prefix}_${suffix} "${fip_${suffix}}" PARENT_SCOPE)
-    endforeach(suffix)
-    
-    if(fip_KERNEL)
-	# Set derivative install path and prefixes
-	# additional, 1
-	if(fip_INSTALL_TYPE MATCHES GLOBAL)
-	    set(fip_KERNEL_INSTALL_PREFIX_KMODULE
-		"/lib/modules/%kernel%/extra"
-	    )
-	else(fip_INSTALL_TYPE MATCHES GLOBAL)
-	    set(fip_KERNEL_INSTALL_PREFIX_KMODULE
-		"${fip_INSTALL_PREFIX_LIB}/modules/%kernel%/extra"
-	    )
-	endif(fip_INSTALL_TYPE MATCHES GLOBAL)
-
-	# additional, 2
-	set(fip_KERNEL_INSTALL_PREFIX_KSYMVERS
-	    "${fip_INSTALL_PREFIX_LIB}/modules/%kernel%/symvers"
-	)
-	# additional, 3
-	set(fip_INSTALL_KINCLUDE_DIR "${fip_INSTALL_INCLUDE_DIR}")
-	set(fip_INSTALL_PREFIX_KINCLUDE "${fip_INSTALL_PREFIX_INCLUDE}")
-
-	# Kernel include files, which depends from kernel version.
-	# This prefix is not listed in path conventions.
-	set(fip_KERNEL_INSTALL_INCLUDE_KERNEL_DIR
-	    "${fip_BASE_INSTALL_PREFIX}/include-kernel/%kernel%"
-	)
-
-	set(fip_KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL
-	    "${fip_KERNEL_INSTALL_INCLUDE_KERNEL_DIR}/${project_name}-kernel"
-	)
-
-	# Export symbols to the outer scope
-	foreach(suffix
-	    KERNEL_INSTALL_PREFIX_KMODULE
-	    KERNEL_INSTALL_PREFIX_KSYMVERS
-	    INSTALL_KINCLUDE_DIR
-	    INSTALL_PREFIX_KINCLUDE
-	    KERNEL_INSTALL_INCLUDE_KERNEL_DIR
-	    KERNEL_INSTALL_PREFIX_INCLUDE_KERNEL
-	)
-	    set(${project_prefix}_${suffix} "${fip_${suffix}}" PARENT_SCOPE)
-	endforeach(suffix)
-    endif(fip_KERNEL)
-endfunction(fill_install_prefixes project_name project_prefix)
-
-
-########################################################################
-# Kernel-dependent paths.
-#
-# Some deliverables may depends on linux kernel.
-#
-# For make "one user installation for several kernels" paradigm works,
-# installation directory for that deliverables should include
-# kernel-version part(like "3.10.2-generic").
-#
-# So, components installed by user installation can determine at runtime,
-# which kernel-dependent deliverable should be used on currently loaded system.
-# They do selection using 'uname -r' request.
-#
-# For define variables represented kernel-dependent directories,
-# we use strings containing "%kernel%" stem.
-
-#  kernel_path(kernel_version RESULT_VARIABLE pattern ...)
-#
-# Form concrete path representation from kernel-dependent pattern(s).
-# Replace occurence of %kernel% in pattern(s) with given @kernel_version string.
-# Result is stored in the RESULT_VARIABLE.
-#
-# @kernel_version may be concrete version of the kernel,
-# or variable reference in some language.
-macro(kernel_path kernel_version RESULT_VARIABLE pattern)
-    string(REPLACE "%kernel%" "${kernel_version}" ${RESULT_VARIABLE} ${pattern} ${ARGN})
-endmacro(kernel_path kernel_version RESULT_VARIABLE pattern)
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -207,8 +207,13 @@ check_errors() {
 }

 compilations() {
-  cd $OPENAIR_DIR/cmake_targets/$1/build
-  echo_info "Log file for compilation is being written to: $dlog/$2.txt"
+  local dir=$1
+  shift 1
+  local logfile=$1
+  shift 1
+  local targets=$@
+  cd $OPENAIR_DIR/cmake_targets/$dir/build
+  echo_info "Log file for compilation is being written to: $dlog/$logfile"
  set +e
  {
    if [ "$BUILD_COVERITY_SCAN" == "1" ]; then
@@ -217,28 +222,27 @@ compilations() {
        COV_SCAN_PREFIX=""
    fi
    if [ "$MAKE_CMD" != "" ]; then
-       $MAKE_CMD $2
+       $MAKE_CMD $targets
    else 
    if [ "$VERBOSE_COMPILE" == "1" ]; then
-       $COV_SCAN_PREFIX make -j`nproc` $2 VERBOSE=$VERBOSE_COMPILE
+       $COV_SCAN_PREFIX make -j`nproc` $targets VERBOSE=$VERBOSE_COMPILE
    else
-       $COV_SCAN_PREFIX make -j`nproc` $2
+       $COV_SCAN_PREFIX make -j`nproc` $targets
    fi
    fi
    ret=$?
-  } > $dlog/$2.txt 2>&1
-  set -e
+  } > $dlog/$logfile 2>&1
  if [ "$VERBOSE_CI" == "1" ]; then
-     echo_info "====== Start of log for $2.txt ======"
-     cat $dlog/$2.txt
-     echo_info "====== End of log for $2.txt ======"
+     echo_info "====== Start of log for $logfile ======"
+     cat $dlog/$logfile
+     echo_info "====== End of log for $logfile ======"
  fi
-  check_warnings "$dlog/$2.txt"
+  check_warnings "$dlog/$logfile"
  if [[ $ret -eq 0 ]]; then
-     echo_success "$2 compiled"
+     echo_success "$targets compiled"
  else
-     check_errors "$dlog/$2.txt"
-     echo_error "$2 compilation failed"
+     check_errors "$dlog/$logfile"
+     echo_error "compilation of $targets failed"
     exit 1
  fi
 }
@@ -590,19 +594,10 @@ check_install_oai_software() {
    case "$(get_distribution_release)" in
        "ubuntu18.04")
            add_cmake_repo
-            specific_packages="libgcrypt11-dev guile-2.0-dev"
-            ;;
-        "ubuntu20.04")
-            specific_packages="guile-2.0-dev"
-            ;;
-         "ubuntu21.04")
-            specific_packages="guile-2.0-dev"
-            ;;
-         "ubuntu22.04")
-            specific_packages="guile-2.2-dev"
+            specific_packages="libgcrypt11-dev"
            ;;
         "debian11")
-            specific_packages="guile-2.2-dev libz-dev"
+            specific_packages="libz-dev"
            ;;
    esac
    $SUDO apt-get install -y \
@@ -623,8 +618,6 @@ check_install_oai_software() {
 	libsctp-dev  \
 	libssl-dev  \
 	libtool  \
-	libxslt1-dev \
-	libtasn1-6-dev \
 	patch \
 	openssl \
        xxd
@@ -645,7 +638,6 @@ check_install_oai_software() {
      gcc \
      gcc-c++ \
      git \
-      guile-devel \
      atlas-devel \
      pkgconfig \
      libconfig-devel \
@@ -653,9 +645,7 @@ check_install_oai_software() {
      libgcrypt-devel \
      lksctp-tools \
      lksctp-tools-devel \
-      libtasn1 \
      libtool \
-      libxslt-devel \
      ninja-build \
      make \
      openssl \
--- a/Show More
+++ b/Show More