Updaing branch with 5G SL README

Merge branch 'episys/david/fixing_buffer_overflow' into 'episys/master-sl'
Episys/david/fixing buffer overflow See merge request aburger/openairinterface5g!248
2026-07-19 23:50:30 +00:00 · 2023-11-10 15:26:46 +00:00 · 2023-10-12 00:51:48 +00:00 · 2023-10-12 00:51:48 +00:00 · 2023-10-05 20:38:59 +00:00 · 2023-10-05 20:38:59 +00:00
714 changed files with 46823 additions and 139203 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,107 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: After
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     200
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        1
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth:        2
+UseTab:          Never
+...
+
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -21,10 +21,10 @@

 # Author: laurent THOMAS, Lionel GAUTHIER

-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.5)
 project (OpenAirInterface LANGUAGES C CXX)

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

 # System packages that are required
 # We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/
@@ -55,17 +55,17 @@ if (${RF_BOARD} STREQUAL "OAI_USRP")
  find_package(Boost REQUIRED)

 elseif (${RF_BOARD} STREQUAL "OAI_IRIS")
-    include_directories("${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/")
+    include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")

    set(HW_SOURCE ${HW_SOURCE}
-            ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp)
+            ${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp)
    LINK_DIRECTORIES("/usr/local/lib")
    set(option_HW_lib "-lSoapySDR -rdynamic -ldl")

 elseif (${RF_BOARD} STREQUAL "OAI_AW2SORI")
-    include_directories("${OPENAIR_TARGETS}/ARCH/AW2SORI")
+    include_directories("${OPENAIR_DIR}/sdr/AW2SORI")
    set(HW_SOURCE ${HW_SOURCE}
-	    ${OPENAIR_TARGETS}/ARCH/AW2SORI/ARCH/AW2SORI/oaiori.c)
+	    ${OPENAIR_DIR}/sdr/AW2SORI/ARCH/AW2SORI/oaiori.c)
    LINK_DIRECTORIES("/usr/local/lib")
    set(openair_HW_lib "-shared -fPIC -msse4 -g -ggdb -lori")

@@ -98,6 +98,7 @@ endif()

 add_definitions("-DNETTLE_VERSION_MAJOR=${NETTLE_VERSION_MAJOR}")
 add_definitions("-DNETTLE_VERSION_MINOR=${NETTLE_VERSION_MINOR}")
+add_definitions("-DPHY_SIDE_LINK")

 pkg_search_module(XPM xpm)
 if(NOT ${XPM_FOUND})
@@ -334,13 +335,9 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")

 # Debug related options
 #########################################
-add_boolean_option(ASN_EMIT_DEBUG      False "ASN1 coder/decoder Debug")
-add_boolean_option(ASN_THREAD_SAFE     True "ASN1 coder/decoder Debug")
-add_boolean_option(MSG_PRINT           True "print debug messages")
+add_boolean_option(DEBUG_ASN1C      False "ASN1 coder/decoder Debug traces, see common/utils/config.h, the logs are regular OAI logs, in the log group 'ASN'")
 add_boolean_option(DISABLE_XER_PRINT   False "print XER Format")
 add_boolean_option(XER_PRINT           False "print XER Format")
-add_boolean_option(RRC_MSG_PRINT       False "print RRC messages")
-add_boolean_option(PDCP_MSG_PRINT      False "print PDCP messages to /tmp/pdcp.log")
 add_boolean_option(DEBUG_PDCP_PAYLOAD  False "print PDCP PDU to stdout")  # if true, make sure that global and PDCP log levels are trace
 add_boolean_option(DEBUG_MAC_INTERFACE False "print MAC-RLC PDU exchange to stdout") # if true, make sure that global and PDCP log levels are trace
 add_boolean_option(TRACE_RLC_PAYLOAD   False "print RLC PDU to stdout") # if true, make sure that global and PDCP log levels are trace
@@ -358,6 +355,12 @@ add_library(ITTI
  )
 add_dependencies(ITTI rrc_flag)

+# asn1c skeletons have hardcoded this flag to make customized debug logs
+# OAI uses this feature to re-use OAI LOG_I(ASN, ...)
+if (DEBUG_ASN1C)
+  add_definitions(-DHAVE_CONFIG_H)
+endif()
+
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
@@ -733,53 +736,53 @@ set (SHLIB_LOADER_SOURCES
 ######################################################################

 set(HWLIB_USRP_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+  ${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/usrp_lib.cpp
  )
 add_library(oai_usrpdevif MODULE ${HWLIB_USRP_SOURCE} )
 target_include_directories(oai_usrpdevif PRIVATE
-  "${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/"
+  "${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/"
  ${Boost_INCLUDE_DIR}
 )
 target_link_libraries(oai_usrpdevif uhd)

-include_directories("${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/")
 set(HWLIB_BLADERF_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+  ${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.c
  )
 add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
 target_link_libraries(oai_bladerfdevif bladeRF)

-include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/")

 set(HWLIB_LMSSDR_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+  ${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/lms_lib.cpp
  )
 add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
 target_include_directories(oai_lmssdrdevif PRIVATE /usr/local/include/lime)
 target_link_libraries(oai_lmssdrdevif LimeSuite )


-include_directories("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/")
 set(TPLIB_ETHERNET_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_udp.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_raw.c
  )
 add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )

-include_directories("${OPENAIR_TARGETS}/ARCH/AW2SORI/")
+include_directories("${OPENAIR_DIR}/sdr/AW2SORI/")
 link_directories("/usr/local/lib")
 set(HWLIB_AW2SORI_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/AW2SORI/oaiori.c
+  ${OPENAIR_DIR}/sdr/AW2SORI/oaiori.c
  )
 add_library(aw2sori_transpro MODULE ${HWLIB_AW2SORI_SOURCE})
 target_compile_options(aw2sori_transpro PRIVATE -shared -fPIC -msse4 -g -ggdb -DLITE_COMPILATION)
 target_link_libraries(aw2sori_transpro libori.so)

-include_directories("${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/")
+include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")
 set(option_HWIRISLIB_lib "-l SoapySDR")
 set(HWLIB_IRIS_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp
+  ${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp
  )
 add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE})
 target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/)
@@ -792,11 +795,11 @@ target_link_libraries(oai_irisdevif SoapySDR)
 include_directories ("/usr/include/dpdk")

 set(HWLIB_BENETEL_4G_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/benetel.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/shared_buffers.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/low.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/low_dpdk.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/4g/dpdk_driver.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/benetel.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/shared_buffers.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low_dpdk.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/dpdk_driver.c
  )
 add_library(benetel_4g MODULE ${HWLIB_BENETEL_4G_SOURCE} )

@@ -810,11 +813,11 @@ TARGET_LINK_LIBRARIES(benetel_4g pthread dl rt m numa)
 ######################################################################

 set(HWLIB_BENETEL_5G_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/5g/benetel.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/5g/shared_buffers.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/5g/low.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/5g/low_dpdk.c
-  ${OPENAIR_TARGETS}/ARCH/ETHERNET/benetel/5g/dpdk_driver.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/benetel.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/shared_buffers.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low_dpdk.c
+  ${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/dpdk_driver.c
  )
 add_library(benetel_5g MODULE ${HWLIB_BENETEL_5G_SOURCE} )

@@ -826,7 +829,32 @@ TARGET_LINK_LIBRARIES(benetel_5g pthread dl rt m numa)

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

-include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
+# LDPC offload library
+##########################################################
+
+# there is no generic way to test for T1 Offload, it simply comes with the
+# shared object
+if (EXISTS "/usr/local/lib64/librte_pmd_hpac_sdfec_pmd.so")
+  set(T1_OFFLOAD_FOUND TRUE)
+else()
+  set(T1_OFFLOAD_FOUND FALSE)
+endif()
+
+if(T1_OFFLOAD_FOUND)
+  message(STATUS "T1 Offload support detected")
+  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib64/pkgconfig/")
+  pkg_search_module(LIBDPDK REQUIRED libdpdk=20.05.0)
+  add_library(ldpc_offload MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_offload PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_compile_options(ldpc_offload PRIVATE ${LIBDPDK_CFLAGS})
+  target_link_libraries(ldpc_offload ${LIBDPDK_LDFLAGS} rte_pmd_hpac_sdfec_pmd "-Wl,-rpath /usr/local/lib64")
+else()
+  message(STATUS "No T1 Offload support detected")
+endif ()
+
+##########################################################
+
+include_directories ("${OPENAIR_DIR}/sdr/COMMON")

 Message("DEADLINE_SCHEDULER flag  is ${DEADLINE_SCHEDULER}")
 Message("CPU_Affinity flag is ${CPU_AFFINITY}")
@@ -845,7 +873,6 @@ add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION w
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
-add_boolean_option(ITTI_SIM                 False         "enable itti simulator")

 ########################
 # Include order
@@ -999,7 +1026,7 @@ include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/targets/COMMON")
-include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
+include_directories("${OPENAIR_DIR}/sdr/COMMON")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PHY")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
 include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/RRC")
@@ -1215,6 +1242,7 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/system.c
  ${OPENAIR_DIR}/common/utils/backtrace.c
  ${OPENAIR_DIR}/common/utils/time_meas.c
+  ${OPENAIR_DIR}/common/utils/time_stat.c
 )

 set(SECU_OSA_SRC
@@ -1514,7 +1542,6 @@ set(PHY_SRC

 set(PHY_SRC_RU
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/drs_modulation.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
@@ -1578,6 +1605,9 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/scrambling_luts.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_transport_common.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_llr_computation_common.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_demodulation_common.c
  )

  set(PHY_NR_SRC
@@ -1632,17 +1662,28 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_generate_psbch_dmrs_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/psbch_nr_sl.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_slsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_slsch_llr_computation.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_transport_common.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_slsch_coding.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_slsch_decoding.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_sch_dmrs_sl.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_prach.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -1651,6 +1692,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/csi_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_slsch_ue.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
@@ -1674,7 +1716,8 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
  ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
  ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
-  #  ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_pss_sl_test.c
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_sss_sl_test.c
  ${PHY_POLARSRC}
  ${PHY_SMALLBLOCKSRC}
  ${PHY_NR_CODINGIF}
@@ -1872,6 +1915,8 @@ set(L2_NR_SRC
  ${NR_RRC_DIR}/rrc_gNB.c
  ${NR_RRC_DIR}/nr_rrc_common.c
  ${NR_RRC_DIR}/L2_nr_interface.c
+  ${NR_RRC_DIR}/mac_rrc_dl_direct.c
+  ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
  ${NR_RRC_DIR}/nr_rrc_config.c
  ${NR_RRC_DIR}/rrc_gNB_nsa.c
  ${NR_RRC_DIR}/rrc_gNB_internode.c
@@ -1950,6 +1995,9 @@ set (MAC_NR_SRC
  ${NR_GNB_MAC_DIR}/gNB_scheduler_uci.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_srs.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler_RA.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
+  ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
 )


@@ -2501,15 +2549,15 @@ target_link_libraries(nrscope ${XFORMS_LIBRARIES})


 add_library(rfsimulator MODULE
-  ${OPENAIR_TARGETS}/ARCH/rfsimulator/simulator.c
-  ${OPENAIR_TARGETS}/ARCH/rfsimulator/apply_channelmod.c
-  ${OPENAIR_TARGETS}/ARCH/rfsimulator/new_channel_sim.c
+  ${OPENAIR_DIR}/sdr/rfsimulator/simulator.c
+  ${OPENAIR_DIR}/sdr/rfsimulator/apply_channelmod.c
+  ${OPENAIR_DIR}/sdr/rfsimulator/new_channel_sim.c
  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
 	)
 target_link_libraries(rfsimulator SIMU_COMMON ${ATLAS_LIBRARIES})

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

@@ -2570,7 +2618,7 @@ add_executable(nfapi_test
  )

 add_executable(replay_node
-  ${OPENAIR_TARGETS}/ARCH/rfsimulator/stored_node.c
+  ${OPENAIR_DIR}/sdr/rfsimulator/stored_node.c
  )
 target_link_libraries (replay_node minimal_lib)

@@ -2597,8 +2645,8 @@ add_executable(lte-softmodem
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR2_DIR}/F1AP/dummy_enb.c
@@ -2637,8 +2685,8 @@ add_executable(ocp-enb
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/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
@@ -2666,8 +2714,8 @@ target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m CONFIG_LIB rt cryp
 add_executable(oairu
  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
  ${OPENAIR_TARGETS}/RT/USER/ru_control.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
  ${OPENAIR_DIR}/executables/main_ru.c
@@ -2692,8 +2740,8 @@ add_executable(lte-uesoftmodem
  ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/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
@@ -2738,8 +2786,8 @@ add_executable(nr-softmodem
  ${OPENAIR_DIR}/executables/nr-softmodem.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/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
@@ -2766,7 +2814,11 @@ target_link_libraries (nr-softmodem pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRA
 target_link_libraries (nr-softmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (nr-softmodem ${T_LIB})

-add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
+add_dependencies( nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
+
+if(T1_OFFLOAD_FOUND)
+add_dependencies( nr-softmodem ldpc_offload)
+endif ()

 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2779,8 +2831,9 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
+  ${OPENAIR1_DIR}/SIMULATION/TOOLS/rangen_double.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/COMMON/record_player.c
  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
@@ -2812,6 +2865,7 @@ if (CUDA_FOUND)
   add_dependencies( nr-uesoftmodem ldpc_cuda)
   add_dependencies( nr-softmodem ldpc_cuda)
 endif (CUDA_FOUND)
+
 ###################################"
 # Addexecutables for tests
 ####################################
@@ -2834,7 +2888,7 @@ target_link_libraries (dlsim_tm4
 add_executable(rftest
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_scope.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
+  ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${SHLIB_LOADER_SOURCES}
 )
@@ -2904,7 +2958,28 @@ target_link_libraries(nr_pbchsim
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
  )

-#PUCCH ---> Prashanth
+  add_executable(nr_psbchsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${T_SOURCE}
+  ${SHLIB_LOADER_SOURCES}
+  )
+target_link_libraries(nr_psbchsim
+  -Wl,--start-group UTIL SIMU_COMMON 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
+  )
+
+  add_executable(nr_psschsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psschsim.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${T_SOURCE}
+  ${SHLIB_LOADER_SOURCES}
+  )
+target_link_libraries(nr_psschsim
+  -Wl,--start-group UTIL SIMU_COMMON 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
+  )
+
 add_executable(nr_pucchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
@@ -2975,6 +3050,11 @@ add_executable(nr_ulsim
  ${T_SOURCE}
  ${SHLIB_LOADER_SOURCES}
  )
+
+if(T1_OFFLOAD_FOUND)
+add_dependencies( nr_ulsim ldpc_offload)
+endif ()
+
 target_link_libraries(nr_ulsim
  -Wl,--start-group UTIL SIMU_COMMON 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 RRC_LIB NR_RRC_LIB CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE X2AP_ENB X2AP_LIB SECU_CN NGAP_GNB NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI ${OPENSSL_LIBRARIES} dl
@@ -3029,9 +3109,9 @@ if (${T_TRACER})
  foreach(i
        #all "add_executable" definitions (except tests, rb_tool, updatefw)
        lte-softmodem lte-uesoftmodem nr-softmodem
-        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7 nr-ittisim
+        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
        ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
-        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
+        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_psbchsim nr_pucchsim
        nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
        #all "add_library" definitions
        ITTI RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP
@@ -3115,50 +3195,6 @@ add_executable(rb_tool
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)

-# nr-ittisim
-###################################################
-
-add_executable(nr-ittisim
-  ${rrc_h}
-  ${nr_rrc_h}
-  ${OPENAIR2_DIR}/GNB_APP/gnb_app.c
-  ${OPENAIR2_DIR}/GNB_APP/gnb_config.c
-  ${OPENAIR_DIR}/executables/nr-gnb.c
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR2_DIR}/SIMULATION/NR_RRC/itti_sim.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
-  ${OPENAIR_TARGETS}/ARCH/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
-  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
-  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
-  ${OPENAIR2_DIR}/ENB_APP/flexran_agent_ran_api_to_fix.c
-  ${XFORMSINTERFACE_SOURCE}
-  ${T_SOURCE}
-  ${SHLIB_LOADER_SOURCES}
-  )
-
-target_link_libraries (nr-ittisim
-  -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 ${FLPT_MSG_LIB} ${FLEXRAN_AGENT_LIB} ${RAL_LIB} ${NAS_SIM_LIB} RRC_LIB NR_RRC_LIB
-  NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
-  X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${FSPT_MSG_LIB}
-  PHY_NR_UE SCHED_NR_UE_LIB NR_L2_UE
-  -Wl,--end-group z dl)
-
-target_link_libraries (nr-ittisim ${LIBXML2_LIBRARIES})
-target_link_libraries (nr-ittisim pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${ATLAS_LIBRARIES})
-target_link_libraries (nr-ittisim ${LIB_LMS_LIBRARIES})
-target_link_libraries (nr-ittisim ${T_LIB})
-
-add_dependencies( nr-ittisim ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
-
 # ???
 ####################
 list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
@@ -3196,3 +3232,5 @@ ADD_CUSTOM_TARGET(oarf

 include (${OPENAIR_DIR}/common/utils/telnetsrv/telnetsrv_CMakeLists.txt)
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
+
+add_subdirectory(openair2)
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -21,7 +21,6 @@ The Regents of the University of California: BSD 3-Clause Licence.

 Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.

-## Credits for source code openair3/GTPV1-U/nw-gtpv1u: ##
-
-Amit Chawre <http://www.amitchawre.net/contact.html>: BSD 2-Clause Licence.
+## Credits for source code openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c and nrLDPC_offload.h: ##

+Intel Corporation SPDX-License-Identifier: BSD-3-Clause Licence
--- a/ci-scripts/Episci_5G_SL_README.md
+++ b/ci-scripts/Episci_5G_SL_README.md
@@ -0,0 +1,55 @@
+# Running 5G Sidelink mode 2 tests
+To launch tests, a python script `run_sl_test.py` is provided. It provides 2 test modes: one is launching RFSIM, the other is launching USRP. The configurations of different tests are specified in `sl_net_config.json`.
+The python run script and configurations files are located under `~/openairinterface5g/ci-scripts`.
+
+The following examples show three nodes tests for each mode.
+
+## Launching in RFSIM test mode ##
+Open a terminal and run the following commands.
+```
+cd ~/openairinterface5g/ci-scripts
+```
+To run rfsim test with the net 2 specified in `sl_net_config.json`, the following command is used.
+```
+python3 run_sl_test.py --test rfsim --net 2
+```
+
+## Launching in USRP test mode ##
+The following is an example to run remote machine (nearby).
+The syncref UE is launched on the current machine, and a single
+nearby UE is launched on the machine specified by the `--host` and
+`--user` flags. The `-r` will enable this simulation to be repeated
+three times.
+
+```
+python3 run_sl_test.py --user account --host 10.1.1.68 -r 3 --test usrp
+```
+The following is an example to run just a Sidelink Nearby UE.
+By specifying `-l` nearby, only the nearby UE will be launched
+on the machine specified by the `--host` and `--user` flags.
+The `-r` will enable this simulation to be repeated two times.
+
+```
+python3 run_sl_test.py -l nearby --user account --host 10.1.1.68 -r 2 --test usrp
+```
+To run usrp test in the net 3 specified in `sl_net_config.json`, the following command is used.
+
+```
+python3 run_sl_test.py --test usrp --net 3
+```
+#
+# See `--help` for more information.
+#
+
+# Checking launching result #
+
+All results will be logged into log files in home folder by default with the file name following `-l` flag.
+
+In case of above example, the following files will be created after the test.
+
+```
+Shell> ls ~/*.log
+~/syncref1.log
+~/nearby2.log
+~/nearby3.log
+```
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -136,16 +136,16 @@ pipeline {
            }
          }
        }
-        stage ("RHEL8 Build") {
+        stage ("RHEL8-Cluster-Image-Builder") {
          steps {
            script {
-              triggerSlaveJob ('RAN-RHEL8-Image-Builder', 'RHEL8-Images-Build')
+              triggerSlaveJob ('RAN-RHEL8-Cluster-Image-Builder', 'RHEL8-Cluster-Image-Builder')
            }
          }
          post {
            always {
              script {
-                finalizeSlaveJob('RAN-RHEL8-Image-Builder')
+                finalizeSlaveJob('RAN-RHEL8-Cluster-Image-Builder')
              }
            }
            failure {
@@ -238,6 +238,26 @@ pipeline {
            }
          }
        }
+        stage ("4G L2 Simulators") {
+          when { expression {doMandatoryTests} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'Test-L2-Sim-Container-4G')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-L2-Sim-Test-4G')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
        stage ("5G L2 Simulators") {
          when { expression {doMandatoryTests} }
          steps {
@@ -318,6 +338,27 @@ pipeline {
            }
          }
        }
+        //avra is offline, re-enable once it is available
+        //stage ("Test T1 Offload") {
+        //  when { expression {doMandatoryTests} }
+        //  steps {
+        //    script {
+        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'Test-T1-Offload')
+        //    }
+        //  }
+        //  post {
+        //    always {
+        //      script {
+        //        finalizeSlaveJob('RAN-T1-Offload-Test')
+        //      }
+        //    }
+        //    failure {
+        //      script {
+        //        currentBuild.result = 'FAILURE'
+        //      }
+        //    }
+        //  }
+        //}
      }
    }
    stage ("Images Push to Registries") {
--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -0,0 +1,254 @@
+#!/bin/groovy
+/*
+ * 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
+ */
+
+// Location of the executor node
+def pythonExecutor = params.pythonExecutor
+
+// Location of the test XML file to be run
+def testXMLFile = params.pythonTestXmlFile
+def mainPythonAllXmlFiles = ""
+def buildStageStatus = true
+
+// Name of the test stage
+def testStageName = params.pipelineTestStageName
+
+// Name of the resource
+def lockResources = []
+if (params.LockResources != null && params.LockResources.trim().length() > 0)
+  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
+
+// Global Parameters. Normally they should be populated when the master job
+// triggers the slave job with parameters
+def eNB_Repository
+def eNB_Branch
+def eNB_CommitID
+def eNB_AllowMergeRequestProcess = false
+def eNB_TargetBranch
+
+def directoryExistsGlob(fileNameWithGlob) {
+  /* if multiple directories match, will join their names and call fileExists() on that */
+  def dir = sh returnStdout: true, script: 'find . -name \'' + fileNameWithGlob + '\' -type d'
+  dir = dir.replaceAll("\n", "").trim()
+  echo "matching '" + fileNameWithGlob + "' found: '"  + dir + "'"
+  if (dir == "")
+    return false
+  return fileExists(dir)
+}
+
+//-------------------------------------------------------------------------------
+// Pipeline start
+pipeline {
+  agent {
+    label pythonExecutor
+  }
+  options {
+    disableConcurrentBuilds()
+    timestamps()
+    ansiColor('xterm')
+    lock(extra: lockResources)
+  }
+
+  stages {
+    stage ('Verify Parameters') {
+      steps {
+        script {
+          echo '\u2705 \u001B[32mVerify Parameters\u001B[0m'
+
+          JOB_TIMESTAMP = sh returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"'
+          JOB_TIMESTAMP = JOB_TIMESTAMP.trim()
+
+          def allParametersPresent = true
+
+          // It is already to late to check it
+          if (params.pythonExecutor != null) {
+            echo "eNB CI executor node  :   ${pythonExecutor}"
+          }
+          // If not present picking a default Stage Name
+          if (params.pipelineTestStageName == null) {
+            // picking default
+            testStageName = 'Template Test Stage'
+          }
+
+          if (params.LockResources == null) {
+            echo "no LockResources given"
+            allParametersPresent = false
+          }
+          if (params.eNB_IPAddress == null) {
+            echo "no eNB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.eNB_Credentials == null) {
+            echo "no eNB_Credentials given"
+            allParametersPresent = false
+          }
+          // the following 4 parameters should be pushed by the master trigger
+          // if not present, take the job GIT variables (used for developing)
+          if (params.eNB_Repository == null) {
+            eNB_Repository = env.GIT_URL
+          } else {
+            eNB_Repository = params.eNB_Repository
+          }
+          echo "eNB_Repository        :   ${eNB_Repository}"
+          if (params.eNB_Branch == null) {
+            eNB_Branch = env.GIT_BRANCH
+          } else {
+            eNB_Branch = params.eNB_Branch
+          }
+          echo "eNB_Branch            :   ${eNB_Branch}"
+          if (params.eNB_CommitID == null) {
+            eNB_CommitID = env.GIT_COMMIT
+          } else {
+            eNB_CommitID = params.eNB_CommitID
+          }
+          echo "eNB_CommitID          :   ${eNB_CommitID}"
+          if (params.eNB_mergeRequest != null) {
+            eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
+            if (eNB_AllowMergeRequestProcess) {
+              if (params.eNB_TargetBranch != null) {
+                eNB_TargetBranch = params.eNB_TargetBranch
+              } else {
+                eNB_TargetBranch = 'develop'
+              }
+              echo "eNB_TargetBranch      :   ${eNB_TargetBranch}"
+            }
+          } else {
+            echo "no eNB_mergeRequest given - not merging develop"
+          }
+
+          if (params.EPC_IPAddress == null) {
+            echo "no EPC_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Type == null) {
+            echo "no EPC_Type given"
+            allParametersPresent = false
+          }
+          if (params.EPC_SourceCodePath == null) {
+            echo "no EPC_SourceCodePath given"
+            allParametersPresent = false
+          }
+          if (params.EPC_Credentials == null) {
+            echo "no EPC_Credentials given"
+            allParametersPresent = false
+          }
+
+          if (params.ADB_IPAddress == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.ADB_Credentials == null) {
+            echo "no ADB_IPAddress given"
+            allParametersPresent = false
+          }
+          if (params.OC_Credentials == null) {
+            echo "no OC_Credentials given"
+            allParametersPresent = false
+          }
+          if (params.OC_ProjectName == null) {
+            echo "no OC_ProjectName given"
+            allParametersPresent = false
+          }
+          if (params.pythonTestXmlFile == null) {
+            echo "no pythonTestXmlFile given"
+            allParametersPresent = false
+          }
+          if (allParametersPresent) {
+            echo "All parameters are present"
+            if (eNB_AllowMergeRequestProcess) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${eNB_CommitID}"
+            }
+          } else {
+            echo "Some parameters are missing"
+            sh "./ci-scripts/fail.sh"
+          }
+        }
+      }
+    }
+
+    stage ("Deploy and Test") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
+            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
+            for (xmlFile in myXmlTestSuite) {
+              if (fileExists(xmlFile)) {
+                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
+                echo "Test XML file         :   ${xmlFile}"
+              }
+            }
+            withCredentials([
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.EPC_Credentials}", usernameVariable: 'EPC_Username', passwordVariable: 'EPC_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password'],
+              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password']
+            ]) {
+              sh "python3 main.py --mode=InitiateHtml --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} ${mainPythonAllXmlFiles}"
+              for (xmlFile in myXmlTestSuite) {
+                if (fileExists(xmlFile)) {
+                  try {
+                    sh "python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --ranRepository=${eNB_Repository} --ranBranch=${eNB_Branch} --ranCommitID=${eNB_CommitID} --ranAllowMerge=${eNB_AllowMergeRequestProcess} --ranTargetBranch=${eNB_TargetBranch} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --EPCIPAddress=${params.EPC_IPAddress} --EPCType=${params.EPC_Type} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --ADBIPAddress=${params.ADB_IPAddress} --ADBUserName=${ADB_Username} --ADBPassword=${ADB_Password} --XMLTestFile=${xmlFile} --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName}"
+                  } catch (Exception e) {
+                    currentBuild.result = 'FAILURE'
+                    buildStageStatus = false
+                  }
+                }
+              }
+              sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
+            }
+          }
+        }
+      }
+    }
+    stage ("Log Collection") {
+      steps {
+        script {
+          dir ('ci-scripts') {
+            if (directoryExistsGlob("build_log_*")) {
+              sh "zip -r -qq build_log_${env.BUILD_ID}.zip build_log_*/*"
+              sh "rm -rf build_log_*/"
+              archiveArtifacts artifacts: "build_log_${env.BUILD_ID}.zip"
+            }
+            if (directoryExistsGlob("test_log_*")) {
+              sh "zip -r -qq test_log_${env.BUILD_ID}.zip test_log_*/*"
+              sh "rm -rf test_log_*/"
+              archiveArtifacts artifacts: "test_log_${env.BUILD_ID}.zip"
+            }
+            if (fileExists("test_results.html")) {
+              sh "mv test_results.html test_results-${env.JOB_NAME}.html"
+              sh "sed -i -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' test_results-${JOB_NAME}.html"
+              archiveArtifacts artifacts: "test_results-${env.JOB_NAME}.html"
+            }
+          }
+        }
+      }
+    }
+  }
+}
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -111,17 +111,7 @@ pipeline {
                        sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
                        sh "zip -r -qq localZip.zip ."

-                        // Running astyle options on the list of modified files by the merge request
-                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
-                        sh "./ci-scripts/checkCodingFormattingRules.sh --src-branch ${env.gitlabSourceBranch} --target-branch ${env.gitlabTargetBranch}"
-                        def res=readFile('./oai_rules_result.txt').trim();
-                        if ("0".equals(res)) {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): All Changed files in Merge Request follow OAI Formatting Rules"
-                            addGitLabMRComment comment: message
-                        } else {
-                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Some Changed files in Merge Request DO NOT follow OAI Formatting Rules"
-                            addGitLabMRComment comment: message
-                        }
+                        // here was an astyle formatting check, with corresponding messages. The same could be done with clang-format
                    } else {
                        echo "Git Branch      is ${GIT_BRANCH}"
                        echo "Git Commit      is ${GIT_COMMIT}"
@@ -132,9 +122,6 @@ pipeline {
                        sh "git log -n1 --pretty=format:\"%s\" > .git/CI_COMMIT_MSG"

                        sh "zip -r -qq localZip.zip ."
-                        // Running astyle options on all C/H files in the repository
-                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
-                        sh "./ci-scripts/checkCodingFormattingRules.sh"
                    }
                }
            }
@@ -187,7 +174,7 @@ pipeline {
                }
              }
            }
-   }
+        }
        
        stage ("Variant Builds") {
            parallel {
@@ -349,165 +336,6 @@ pipeline {
                        }
                    }
                }
-                stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJob ('eNB-CI-FDD-Band7-B210', 'Test-Mono-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJob ('eNB-CI-TDD-Band40-B210', 'Test-Mono-TDD-Band40')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-TDD-Band40-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test IF4p5 - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-IF4p5-FDD-Band7-B210', 'Test-IF4p5-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-IF4p5-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test F1 - FDD - Band 7 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-F1-FDD-Band7-B210', 'Test-F1-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-F1-FDD-Band7-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test IF4p5 - TDD - Band 40 - B210") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-IF4p5-TDD-Band40-B210', 'Test-IF4p5-TDD-Band40')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-CI-IF4p5-TDD-Band40-B210')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test OAI UE - FDD - Band 20 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            triggerSlaveJobNoGitLab ('UE-CI-FDD-Band20-B200')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('UE-CI-FDD-Band20-B200')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
-                stage ("Test OAI UE - OAI eNB - FDD - Band 7 - B200") {
-                    when {
-                        expression {doFullTestsuite}
-                    }
-                    steps {
-                        script {
-                            // Delayed trigger on slave job, so it is always the last one to run
-                            sh "sleep 240"
-                            triggerSlaveJob ('eNB-UE-CI-MONO-FDD-Band7-B200', 'Test-eNB-OAI-UE-FDD-Band7')
-                        }
-                    }
-                    post {
-                        always {
-                            script {
-                                finalizeSlaveJob('eNB-UE-CI-MONO-FDD-Band7-B200')
-                            }
-                        }
-                        failure {
-                            script {
-                                currentBuild.result = 'FAILURE'
-                            }
-                        }
-                    }
-                }
            }
            post {
                always {
@@ -583,68 +411,3 @@ OAI CI Team''',
        }
    }
 }
-
-// ----  Slave Job functions
-
-def triggerSlaveJob (jobName, gitlabStatusName) {
-    // Workaround for the "cancelled" GitLab pipeline notification
-    // The slave job is triggered with the propagate false so the following commands are executed
-    // Its status is now PASS/SUCCESS from a stage pipeline point of view
-    // localStatus variable MUST be analyzed to properly assess the status
-    localStatus = build job: jobName,
-        parameters: [
-            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-            string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-            string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-            booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
-            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-        ], propagate: false
-    localResult = localStatus.getResult()
-    echo "${jobName} Slave Job status is ${localResult}"
-    gitlabCommitStatus(name: gitlabStatusName) {
-        if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-           echo "${jobName} Slave Job is OK"
-        } else {
-           echo "${jobName} Slave Job is KO"
-           sh "ci-scripts/fail.sh"
-        }
-    }
-}
-
-def triggerSlaveJobNoGitLab (jobName) {
-    // Workaround for the "cancelled" GitLab pipeline notification
-    // The slave job is triggered with the propagate false so the following commands are executed
-    // Its status is now PASS/SUCCESS from a stage pipeline point of view
-    // localStatus variable MUST be analyzed to properly assess the status
-    localStatus = build job: jobName,
-        parameters: [
-            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-            string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-            string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-            booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
-            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-        ], propagate: false
-    localResult = localStatus.getResult()
-    echo "${jobName} Slave Job status is ${localResult}"
-    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
-       echo "${jobName} Slave Job is OK"
-    } else {
-       echo "${jobName} Slave Job is KO"
-       sh "ci-scripts/fail.sh"
-    }
-}
-
-def finalizeSlaveJob(jobName) {
-    // In case of any non-success, we are retrieving the HTML report of the last completed
-    // slave job. The only drop-back is that we may retrieve the HTML report of a previous build
-    fileName = "test_results-${jobName}.html"
-    if (!fileExists(fileName)) {
-        copyArtifacts(projectName: jobName,
-            filter: 'test_results*.html',
-            selector: lastCompleted())
-        if (fileExists(fileName)) {
-            sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"
-            archiveArtifacts artifacts: fileName
-        }
-    }
-}
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -41,7 +41,7 @@ import constants as CONST
 #-----------------------------------------------------------


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


    py_param_file_present = False
@@ -82,6 +82,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
            CONTAINERS.ranRepository=matchReg.group(1)
            SCA.ranRepository=matchReg.group(1)
            PHYSIM.ranRepository=matchReg.group(1)
+            CLUSTER.ranRepository=matchReg.group(1)
        elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
            if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
@@ -96,6 +97,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                CONTAINERS.ranAllowMerge=True
                SCA.ranAllowMerge=True
                PHYSIM.ranAllowMerge=True
+                CLUSTER.ranAllowMerge=True
        elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
            if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
@@ -108,6 +110,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
            CONTAINERS.ranBranch=matchReg.group(1)
            SCA.ranBranch=matchReg.group(1)
            PHYSIM.ranBranch=matchReg.group(1)
+            CLUSTER.ranBranch=matchReg.group(1)
        elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
            if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
@@ -120,6 +123,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
            CONTAINERS.ranCommitID=matchReg.group(1)
            SCA.ranCommitID=matchReg.group(1)
            PHYSIM.ranCommitID=matchReg.group(1)
+            CLUSTER.ranCommitID=matchReg.group(1)
        elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
            if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
@@ -132,6 +136,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
            CONTAINERS.ranTargetBranch=matchReg.group(1)
            SCA.ranTargetBranch=matchReg.group(1)
            PHYSIM.ranTargetBranch=matchReg.group(1)
+            CLUSTER.ranTargetBranch=matchReg.group(1)
        elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
            if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
@@ -140,6 +145,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                CONTAINERS.eNBIPAddress=matchReg.group(1)
                SCA.eNBIPAddress=matchReg.group(1)
                PHYSIM.eNBIPAddress=matchReg.group(1)
+                CLUSTER.eNBIPAddress=matchReg.group(1)
            elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1IPAddress=matchReg.group(1)
@@ -156,6 +162,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                CONTAINERS.eNBUserName=matchReg.group(1)
                SCA.eNBUserName=matchReg.group(1)
                PHYSIM.eNBUserName=matchReg.group(1)
+                CLUSTER.eNBUserName=matchReg.group(1)
            elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1UserName=matchReg.group(1)
@@ -172,6 +179,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                CONTAINERS.eNBPassword=matchReg.group(1)
                SCA.eNBPassword=matchReg.group(1)
                PHYSIM.eNBPassword=matchReg.group(1)
+                CLUSTER.eNBPassword=matchReg.group(1)
            elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1Password=matchReg.group(1)
@@ -188,6 +196,7 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
                SCA.eNBSourceCodePath=matchReg.group(1)
                PHYSIM.eNBSourceCodePath=matchReg.group(1)
+                CLUSTER.eNBSourceCodePath=matchReg.group(1)
            elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
                RAN.eNB1SourceCodePath=matchReg.group(1)
@@ -260,12 +269,21 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM):
        elif re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCUserName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCUserName = matchReg.group(1)
+            CLUSTER.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)
        elif re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-OCProjectName=(.+)$', myArgv, re.IGNORECASE)
            PHYSIM.OCProjectName = matchReg.group(1)
+            CLUSTER.OCProjectName = matchReg.group(1)
+        elif re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCUrl=(.+)$', myArgv, re.IGNORECASE)
+            CLUSTER.OCUrl = matchReg.group(1)
+        elif re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE):
+            matchReg = re.match('^\-\-OCRegistry=(.+)$', myArgv, re.IGNORECASE)
+            CLUSTER.OCRegistry = matchReg.group(1)
        elif re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE):
            matchReg = re.match('^\-\-BuildId=(.+)$', myArgv, re.IGNORECASE)
            RAN.BuildId = matchReg.group(1)
--- a/ci-scripts/astyle-options.txt
+++ b/ci-scripts/astyle-options.txt
@@ -1,26 +0,0 @@
-# OAI is using a style that is similar to the Google style
--style=google
-# long options can be written without the preceding '--'
-# Convert tabs to spaces
-convert-tabs
-# Indentation is 2 spaces
-indent=spaces=2
-# Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block. 
-indent-switches
-# Indent preprocessor blocks at bracket level 0.
-indent-preproc-block
-# Indent multi-line preprocessor #define statements.
-indent-preproc-define
-# Indent C++ comments beginning in column one.
-indent-col1-comments
-# Pad empty lines around header blocks
-break-blocks
-delete-empty-lines
-# Attach a pointer or reference operator (*, &, or ^) to the variable name (right)
-align-pointer=name
-# The code line length is 200 characters/columns (this is the maximum allowed by astyle)
-max-code-length=200
-# If the line contains logical conditionals they will be placed first on the new line.
-break-after-logical
-# Force use of the linux end of line
-lineend=linux
--- a/ci-scripts/checkCodingFormattingRules.sh
+++ b/ci-scripts/checkCodingFormattingRules.sh
@@ -24,8 +24,6 @@ function usage {
    echo "OAI Coding / Formatting Guideline Check script"
    echo "   Original Author: Raphael Defosseux"
    echo ""
-    echo "   Requirement: astyle shall be installed"
-    echo ""
    echo "   By default (no options) the complete repository will be checked"
    echo "   In case of merge request, provided source and target branch,"
    echo "   the script will check only the modified files"
@@ -57,11 +55,10 @@ fi

 if [ $# -eq 0 ]
 then
-    echo " ---- Checking the whole repository ----"
-    echo ""
-    NB_FILES_TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt --recursive --exclude=ci-scripts --exclude=cmake_targets *.c *.h | grep -c Formatted || true`
-    echo "Nb Files that do NOT follow OAI rules: $NB_FILES_TO_FORMAT"
-    echo $NB_FILES_TO_FORMAT > ./oai_rules_result.txt
+    # in this file we previously had a list of files that were not properly
+    # formatted. At the time of this MR, the Jenkinsfile expects this file, so
+    # we simply produce an empty one
+    touch ./oai_rules_result.txt

    # Testing Circular Dependencies protection
    awk '/#[ \t]*ifndef/ { gsub("^.*ifndef *",""); if (names[$1]!="") print "files with same {define ", FILENAME, names[$1]; names[$1]=FILENAME } /#[ \t]*define/ { gsub("^.*define *",""); if(names[$1]!=FILENAME) print "error in declaration", FILENAME, $1, names[$1]; nextfile }' `find openair* common targets executables -name *.h |grep -v LFDS` > header-files-w-incorrect-define.txt
@@ -77,7 +74,7 @@ then
       IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
       IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true`
       IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true`
-       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc|openair1/PHY/CODING/types.h" || true`
+       IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
       if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
       then
           if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -151,10 +148,6 @@ echo ""
 # Retrieve the list of modified files since the latest develop commit
 MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
 NB_TO_FORMAT=0
-if [ -f oai_rules_result_list.txt ]
-then
-    rm -f oai_rules_result_list.txt
-fi
 if [ -f header-files-w-incorrect-define.txt ]
 then
    rm -f header-files-w-incorrect-define.txt
@@ -178,13 +171,6 @@ do
    EXT="${filename##*.}"
    if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
    then
-        TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt $FULLFILE | grep -c Formatted || true`
-        NB_TO_FORMAT=$((NB_TO_FORMAT + TO_FORMAT))
-        if [ $TO_FORMAT -ne 0 ]
-        then
-            echo $FULLFILE
-            echo $FULLFILE >> ./oai_rules_result_list.txt
-        fi
        # Testing if explicit GNU GPL license banner
        GNU_EXCEPTION=`echo $FULLFILE | egrep -c "openair3/NAS/COMMON/milenage.h" || true`
        if [ $GNU_EXCEPTION -eq 0 ]
@@ -198,7 +184,7 @@ do
            IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true`
            IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true`
            IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true`
-            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|common/utils/itti_analyzer/common/queue.h|openair3/UTILS/tree.h|openair3/UTILS/queue.h|openair3/GTPV1-U/nw-gtpv1u|openair2/UTIL/OPT/ws_|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc|openair1/PHY/CODING/types.h" || true`
+            IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true`
            if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ]
            then
                if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ]
@@ -215,9 +201,10 @@ do
    fi
 done
 rm -f header-files-w-incorrect-define-tmp.txt
-echo ""
-echo " ----------------------------------------------------------"
-echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT"
-echo $NB_TO_FORMAT > ./oai_rules_result.txt
+
+# in this script we previously produced a list of files that were not properly
+# formatted. At the time of this MR, the Jenkinsfile expects this file, so
+# we simply produce an empty file
+touch ./oai_rules_result.txt

 exit 0
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -50,7 +50,7 @@ amarisoft_ue_1:
  WakeupScript : none
  DetachScript : none
  #end 
-  Cmd : /root/NV17-12-21/ue/lteue 
+  Cmd : /root/NV18-06-2022/ue/lteue
  Config : /root/NV17-12-21/ue/config/oaicicd-ue-Ping-SATest.cfg 
  Duration : 60
  Ping : /tmp/test_ue1.log
@@ -71,7 +71,7 @@ amarisoft_ue_2:
  WakeupScript : none
  DetachScript : none
  #end 
-  Cmd : /root/NV17-12-21/ue/lteue 
+  Cmd : /root/NV18-06-2022/ue/lteue
  Config : /root/NV17-12-21/ue/config/xxxxxxx.cfg #to be updated for an other scenario 
  Duration : 60
  Ping :
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -0,0 +1,377 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#-----------------------------------------------------------
+# Import
+#-----------------------------------------------------------
+import logging
+import sshconnection as SSH
+import cls_oai_html
+#import os
+import re
+import time
+#import subprocess
+import sys
+import constants as CONST
+import helpreadme as HELP
+import cls_containerize
+
+class Cluster:
+	def __init__(self):
+		self.eNBIPAddress = ""
+		self.eNBSourceCodePath = ""
+		self.forcedWorkspaceCleanup = False
+		self.OCUserName = ""
+		self.OCPassword = ""
+		self.OCProjectName = ""
+		self.OCUrl = "https://api.oai.cs.eurecom.fr:6443"
+		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID = ""
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ""
+
+	def _recreate_entitlements(self, sshSession):
+		# recreating entitlements, don't care if deletion fails
+		sshSession.command('oc delete secret etc-pki-entitlement', '\$', 5)
+		if re.search(r"not found", sshSession.getBefore()):
+			logging.warning("no secrets etc-pki-entitlement found, recreating")
+		sshSession.command('ls /etc/pki/entitlement/???????????????????.pem | tail -1', '\$', 5, silent=True)
+		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", sshSession.getBefore())
+		sshSession.command('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', '\$', 5, silent=True)
+		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", sshSession.getBefore())
+		if regres1 is None or regres2 is None:
+			logging.error("could not find entitlements")
+			return false
+		file1 = regres1.group(0)
+		file2 = regres2.group(0)
+		sshSession.command(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}', '\$', 5)
+		regres = re.search(r"secret/etc-pki-entitlement created", sshSession.getBefore())
+		if regres is None:
+			logging.error("could not create secret/etc-pki-entitlement")
+			return False
+		return True
+
+	def _recreate_bc(self, sshSession, name, newTag, filename):
+		self._retag_image_statement(sshSession, name, name, newTag, filename)
+		sshSession.command(f'oc delete -f {filename}', '\$', 5)
+		sshSession.command(f'oc create -f {filename}', '\$', 5)
+		before = sshSession.getBefore()
+		if re.search('buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', before) is not None:
+			return True
+		logging.error('error while creating buildconfig: ' + sshSession.getBefore())
+		return False
+
+	def _recreate_is_tag(self, sshSession, name, newTag, filename):
+		sshSession.command(f'oc describe is {name}', '\$', 5)
+		if sshSession.getBefore().count('NotFound') > 0:
+			sshSession.command(f'oc create -f {filename}', '\$', 5)
+			before = sshSession.getBefore()
+			if re.search(f'imagestream.image.openshift.io/{name} created', before) is None:
+				logging.error('error while creating imagestream: ' + sshSession.getBefore())
+				return False
+		else:
+			logging.debug(f'-> imagestream {name} found')
+		image = f'{name}:{newTag}'
+		sshSession.command(f'oc delete istag {image}', '\$', 5) # we don't care if this fails, e.g., if it is missing
+		sshSession.command(f'oc create istag {image}', '\$', 5)
+		before = sshSession.getBefore()
+		if re.search(f'imagestreamtag.image.openshift.io/{image} created', before) is not None:
+			return True
+		logging.error('error while creating imagestreamtag: ' + sshSession.getBefore())
+		return False
+
+	def _start_build(self, sshSession, name):
+		# will return "immediately" but build runs in background
+		# if multiple builds are started at the same time, this can take some time, however
+		ret = sshSession.command(f'oc start-build {name} --from-file={self.eNBSourceCodePath}', '\$', 300)
+		before = sshSession.getBefore()
+		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', str(before))
+		if ret != 0 or before.count('Uploading finished') != 1 or regres is None:
+			logging.error("error during oc start-build: " + sshSession.getBefore())
+			self._delete_pod(sshSession, name)
+			return None
+		return regres.group('jobname') + '-build'
+
+	def _delete_pod(self, sshSession, shortName):
+		sshSession.command(f"oc get pods | grep {shortName}", '\$', 5)
+		regres = re.search(rf'{shortName}-[0-9]+-build', sshSession.getBefore())
+		if regres is not None:
+			sshSession.command(f"oc delete pod {regres.group(0)}", '\$', 5)
+		else:
+			logging.warning(f"no pod found with name {shortName}")
+
+	def _wait_build_end(self, sshSession, jobs, timeout_sec, check_interval_sec = 5):
+		logging.debug(f"waiting for jobs {jobs} to finish building")
+		while timeout_sec > 0:
+			# check status
+			for j in jobs:
+				sshSession.command(f'oc get pods | grep {j}', '\$', 10, silent = True)
+				if sshSession.getBefore().count('Completed') > 0: jobs.remove(j)
+				if sshSession.getBefore().count('Error') > 0:
+					logging.error(f'error for job {j}: ' + sshSession.getBefore())
+					return False
+			if jobs == []:
+				logging.debug('all jobs completed')
+				return True
+			time.sleep(check_interval_sec)
+			timeout_sec -= check_interval_sec
+		logging.error(f"timeout while waiting for end of build of {jobs}")
+		return False
+
+	def _retag_image_statement(self, sshSession, oldImage, newImage, newTag, filename):
+		sshSession.command(f'sed -i -e "s#{oldImage}:latest#{newImage}:{newTag}#" {filename}', '\$', 5)
+
+	def _get_image_size(self, sshSession, image, tag):
+		# get the SHA of the image we built using the image name and its tag
+		sshSession.command(f'oc describe is {image} | grep -A4 {tag}', '\$', 5)
+		result = re.search(f'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/(?P<imageSha>{image}@sha256:[a-f0-9]+)', sshSession.getBefore())
+		if result is None:
+			return -1
+		imageSha = result.group("imageSha")
+
+		# retrieve the size
+		sshSession.command(f'oc get -o json isimage {imageSha} | jq -Mc "{{dockerImageSize: .image.dockerImageMetadata.Size}}"', '\$', 5)
+		result = re.search('{"dockerImageSize":(?P<size>[0-9]+)}', str(sshSession.getBefore()))
+		if result is None:
+			return -1
+		return int(result.group("size"))
+
+	def _deploy_pod(self, sshSession, filename, timeout = 30):
+		sshSession.command(f'oc create -f {filename}', '\$', 10)
+		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', sshSession.getBefore())
+		if result is None:
+			logging.error(f'could not deploy pod: {sshSession.getBefore()}')
+			return None
+		pod = result.group("pod")
+		logging.debug(f'checking if pod {pod} is in Running state')
+		while timeout > 0:
+			sshSession.command(f'oc get pod {pod} -o json | jq -Mc .status.phase', '\$', 5, silent=True)
+			if re.search('"Running"', sshSession.getBefore()) is not None: return pod
+			timeout -= 1
+			time.sleep(1)
+		logging.error(f'pod {pod} did not reach Running state')
+		self._undeploy_pod(sshSession, filename)
+		return None
+
+	def _undeploy_pod(self, sshSession, filename):
+		# to save time we start this in the background and trust that oc stops correctly
+		sshSession.command(f'oc delete -f {filename} &', '\$', 5)
+
+	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 == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter: no SSH Credentials')
+		ocUserName = self.OCUserName
+		ocPassword = self.OCPassword
+		ocProjectName = self.OCProjectName
+		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter: no OC Credentials')
+		if self.OCRegistry.startswith("http") and not self.OCRegistry.endswith("/"):
+			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /')
+
+		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, "oaicicd", "SHOULD NOT BE NECESSARY")
+
+		self.testCase_id = HTML.testCase_id
+
+		# Workaround for some servers, we need to erase completely the workspace
+		if self.forcedWorkspaceCleanup:
+			mySSH.command(f'rm -Rf {lSourcePath}', '\$', 15)
+		cls_containerize.CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
+		# we don't necessarily need a forced workspace cleanup, but in
+		# order to reduce the amount of data send to OpenShift, we
+		# manually delete all generated files in the workspace
+		mySSH.command(f'rm -rf {lSourcePath}/cmake_targets/ran_build', '\$', 30);
+
+		baseTag = 'develop'
+		forceBaseImageBuild = False
+		imageTag = 'develop'
+		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
+			imageTag = 'ci-temp'
+			if self.ranTargetBranch == 'develop':
+				mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX', '\$', 5)
+				result = re.search('index', mySSH.getBefore())
+				if result is not None:
+					forceBaseImageBuild = True
+					baseTag = 'ci-temp'
+		else:
+			forceBaseImageBuild = True
+
+		# logging to OC Cluster and then switch to corresponding project
+		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server {self.OCUrl}', '\$', 31)
+		if mySSH.getBefore().count('Login successful.') == 0:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			mySSH.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+
+		mySSH.command(f'oc project {ocProjectName}', '\$', 30)
+		if mySSH.getBefore().count(f'Already on project "{ocProjectName}"') == 0 and mySSH.getBefore().count(f'Now using project "{self.OCProjectName}"') == 0:
+			logging.error(f'\u001B[1mUnable to access OC project {ocProjectName}\u001B[0m')
+			mySSH.command('oc logout', '\$', 30)
+			mySSH.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
+			return False
+
+		self._recreate_entitlements(mySSH)
+
+		status = True # flag to abandon compiling if any image fails
+		attemptedImages = []
+		if forceBaseImageBuild:
+			self._recreate_is_tag(mySSH, 'ran-base', baseTag, 'openshift/ran-base-is.yaml')
+			self._recreate_bc(mySSH, 'ran-base', baseTag, 'openshift/ran-base-bc.yaml')
+			ranbase_job = self._start_build(mySSH, 'ran-base')
+			attemptedImages += ['ran-base']
+			status = ranbase_job is not None and self._wait_build_end(mySSH, [ranbase_job], 600)
+			if not status: logging.error('failure during build of ran-base')
+			mySSH.command(f'oc logs {ranbase_job} > cmake_targets/log/ran-base.log', '\$', 10)
+			# recover logs by mounting image
+			self._retag_image_statement(mySSH, 'ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
+			pod = self._deploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+			if pod is not None:
+				mySSH.command(f'mkdir -p cmake_targets/log/ran-base', '\$', 5)
+				mySSH.command(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base', '\$', 5)
+				self._undeploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+			else:
+				status = False
+
+		if status:
+			self._recreate_is_tag(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
+			self._recreate_bc(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
+			physim_job = self._start_build(mySSH, 'oai-physim')
+			attemptedImages += ['oai-physim']
+
+			self._recreate_is_tag(mySSH, 'ran-build', imageTag, 'openshift/ran-build-is.yaml')
+			self._recreate_bc(mySSH, 'ran-build', imageTag, 'openshift/ran-build-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
+			ranbuild_job = self._start_build(mySSH, 'ran-build')
+			attemptedImages += ['ran-build']
+
+			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end(mySSH, [ranbuild_job, physim_job], 1200)
+			if not wait: logging.error('error during build of ranbuild_job or physim_job')
+			status = status and wait
+			mySSH.command(f'oc logs {ranbuild_job} > cmake_targets/log/ran-build.log', '\$', 10)
+			mySSH.command(f'oc logs {physim_job} > cmake_targets/log/oai-physim.log', '\$', 10)
+
+		if status:
+			self._recreate_is_tag(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
+			self._recreate_bc(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
+			enb_job = self._start_build(mySSH, 'oai-enb')
+			attemptedImages += ['oai-enb']
+
+			self._recreate_is_tag(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
+			self._recreate_bc(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
+			gnb_job = self._start_build(mySSH, 'oai-gnb')
+			attemptedImages += ['oai-gnb']
+
+			self._recreate_is_tag(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
+			self._recreate_bc(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			lteue_job = self._start_build(mySSH, 'oai-lte-ue')
+			attemptedImages += ['oai-lte-ue']
+
+			self._recreate_is_tag(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
+			self._recreate_bc(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
+			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			nrue_job = self._start_build(mySSH, 'oai-nr-ue')
+			attemptedImages += ['oai-nr-ue']
+
+			wait = enb_job is not None and gnb_job is not None and lteue_job is not None and nrue_job is not None and self._wait_build_end(mySSH, [enb_job, gnb_job, lteue_job, nrue_job], 600)
+			if not wait: logging.error('error during build of eNB/gNB/lteUE/nrUE')
+			status = status and wait
+			# recover logs
+			mySSH.command(f'oc logs {enb_job} > cmake_targets/log/oai-enb.log', '\$', 10)
+			mySSH.command(f'oc logs {gnb_job} > cmake_targets/log/oai-gnb.log', '\$', 10)
+			mySSH.command(f'oc logs {lteue_job} > cmake_targets/log/oai-lte-ue.log', '\$', 10)
+			mySSH.command(f'oc logs {nrue_job} > cmake_targets/log/oai-nr-ue.log', '\$', 10)
+
+		# split and analyze logs
+		imageSize = {}
+		for image in attemptedImages:
+			mySSH.command(f'mkdir -p cmake_targets/log/{image}', '\$', 5)
+			mySSH.command(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log', '\$', 5)
+			tag = imageTag if image != 'ran-base' else baseTag
+			size = self._get_image_size(mySSH, image, tag)
+			if size <= 0:
+				imageSize[image] = 'unknown -- BUILD FAILED'
+				status = False
+			else:
+				sizeMb = float(size) / 1000000
+				imageSize[image] = f'{sizeMb:.1f} Mbytes (uncompressed: ~{sizeMb*2.5:.1f} Mbytes)'
+			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')
+
+		grep_exp = "\|".join(attemptedImages)
+		mySSH.command(f'oc get images | grep -e \'{grep_exp}\' > cmake_targets/log/image_registry.log', '\$', 10);
+
+		build_log_name = f'build_log_{self.testCase_id}'
+		cls_containerize.CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, 'oaicicd', CONST.CI_NO_PASSWORD)
+
+		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done', '\$', 60)
+
+		# logout will return eventually, but we don't care when -> start in background
+		mySSH.command('oc logout &', '\$', 5)
+		mySSH.close()
+
+		# Analyze the logs
+		collectInfo = cls_containerize.AnalyzeBuildLogs(build_log_name, attemptedImages, status)
+		for img in collectInfo:
+			for f in collectInfo[img]:
+				status = status and collectInfo[img][f]['status']
+		if not status:
+			logging.debug(collectInfo)
+
+		if status:
+			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'OK', CONST.ALL_PROCESSES_OK)
+		else:
+			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('all', 'KO', CONST.ALL_PROCESSES_OK)
+
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, imageSize)
+
+		return status
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -48,6 +48,107 @@ import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST

+#-----------------------------------------------------------
+# Helper functions used here and in other classes
+# (e.g., cls_cluster.py)
+#-----------------------------------------------------------
+def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
+	# on RedHat/CentOS .git extension is mandatory
+	result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', ranRepository)
+	if result is not None:
+		full_ran_repo_name = ranRepository.replace('git/', 'git')
+	else:
+		full_ran_repo_name = ranRepository + '.git'
+	sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
+	sshSession.command('cd ' + sourcePath, '\$', 5)
+	sshSession.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+	if sshSession.getBefore().count('done.') == 0:
+		logging.warning('did not find \'done.\' in git output while cloning/fetching, was not successful?')
+	sshSession.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+	sshSession.command('git config user.name "OAI Jenkins"', '\$', 5)
+
+	sshSession.command('git clean -x -d -ff', '\$', 30)
+	sshSession.command('mkdir -p cmake_targets/log', '\$', 5)
+	# if the commit ID is provided use it to point to it
+	if ranCommitID != '':
+		sshSession.command('git checkout -f ' + ranCommitID, '\$', 30)
+	# if the branch is not develop, then it is a merge request and we need to do
+	# the potential merge. Note that merge conflicts should already been checked earlier
+	if ranAllowMerge:
+		if ranTargetBranch == '':
+			sshSession.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
+		else:
+			logging.debug('Merging with the target branch: ' + ranTargetBranch)
+			sshSession.command('git merge --ff origin/' + ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
+
+def CopyLogsToExecutor(sshSession, sourcePath, log_name, scpIp, scpUser, scpPw):
+	sshSession.command(f'cd {sourcePath}/cmake_targets', '\$', 5)
+	sshSession.command(f'rm -f {log_name}.zip', '\$', 5)
+	sshSession.command(f'mkdir -p {log_name}', '\$', 5)
+	sshSession.command(f'mv log/* {log_name}', '\$', 5)
+	sshSession.command(f'zip -r -qq {log_name}.zip {log_name}', '\$', 5)
+
+	# copy zip to executor for analysis
+	if (os.path.isfile(f'./{log_name}.zip')):
+		os.remove(f'./{log_name}.zip')
+	if (os.path.isdir(f'./{log_name}')):
+		shutil.rmtree(f'./{log_name}')
+	sshSession.copyin(scpIp, scpUser, scpPw, f'{sourcePath}/cmake_targets/{log_name}.zip', '.')
+	sshSession.command(f'rm -f {log_name}.zip','\$', 5)
+	ZipFile(f'{log_name}.zip').extractall('.')
+
+def AnalyzeBuildLogs(buildRoot, images, globalStatus):
+	collectInfo = {}
+	for image in images:
+		files = {}
+		file_list = [f for f in os.listdir(f'{buildRoot}/{image}') if os.path.isfile(os.path.join(f'{buildRoot}/{image}', f)) and f.endswith('.txt')]
+		# Analyze the "sub-logs" of every target image
+		for fil in file_list:
+			errorandwarnings = {}
+			warningsNo = 0
+			errorsNo = 0
+			with open(f'{buildRoot}/{image}/{fil}', mode='r') as inputfile:
+				for line in inputfile:
+					result = re.search(' ERROR ', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' error:', str(line))
+					if result is not None:
+						errorsNo += 1
+					result = re.search(' WARNING ', str(line))
+					if result is not None:
+						warningsNo += 1
+					result = re.search(' warning:', str(line))
+					if result is not None:
+						warningsNo += 1
+				errorandwarnings['errors'] = errorsNo
+				errorandwarnings['warnings'] = warningsNo
+				errorandwarnings['status'] = globalStatus
+			files[fil] = errorandwarnings
+		# Analyze the target image
+		if os.path.isfile(f'{buildRoot}/{image}.log'):
+			errorandwarnings = {}
+			committed = False
+			tagged = False
+			with open(f'{buildRoot}/{image}.log', mode='r') as inputfile:
+				startOfTargetImageCreation = False # check for tagged/committed only after image created
+				for line in inputfile:
+					result = re.search(f'FROM .* [aA][sS] {image}$', str(line))
+					if result is not None:
+						startOfTargetImageCreation = True
+					if startOfTargetImageCreation:
+						lineHasTag = re.search(f'Successfully tagged {image}:', str(line)) is not None
+						tagged = tagged or lineHasTag
+						# the OpenShift Cluster builder prepends image registry URL
+						lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
+						committed = committed or lineHasCommit
+			errorandwarnings['errors'] = 0 if committed or tagged else 1
+			errorandwarnings['warnings'] = 0
+			errorandwarnings['status'] = committed or tagged
+			files['Target Image Creation'] = errorandwarnings
+		collectInfo[image] = files
+	return collectInfo
+
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -91,8 +192,6 @@ class Containerize():
 		self.cliBuildOptions = ''
 		self.dockerfileprefix = ''
 		self.host = ''
-		self.allImagesSize = {}
-		self.collectInfo = {}

 		self.deployedContainers = []
 		self.tsharkStarted = False
@@ -115,35 +214,6 @@ class Containerize():
 # Container management functions
 #-----------------------------------------------------------

-	def _createWorkspace(self, sshSession, password, sourcePath):
-		# on RedHat/CentOS .git extension is mandatory
-		result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
-		if result is not None:
-			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
-		else:
-			full_ran_repo_name = self.ranRepository + '.git'
-		sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
-		sshSession.command('cd ' + sourcePath, '\$', 5)
-		sshSession.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
-		# Raphael: here add a check if git clone or git fetch went smoothly
-		sshSession.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
-		sshSession.command('git config user.name "OAI Jenkins"', '\$', 5)
-
-		sshSession.command('echo ' + password + ' | sudo -S git clean -x -d -ff', '\$', 30)
-		sshSession.command('mkdir -p cmake_targets/log', '\$', 5)
-		# if the commit ID is provided use it to point to it
-		if self.ranCommitID != '':
-			sshSession.command('git checkout -f ' + self.ranCommitID, '\$', 30)
-		# if the branch is not develop, then it is a merge request and we need to do
-		# the potential merge. Note that merge conflicts should already been checked earlier
-		if (self.ranAllowMerge):
-			if self.ranTargetBranch == '':
-				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
-					sshSession.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
-			else:
-				logging.debug('Merging with the target branch: ' + self.ranTargetBranch)
-				sshSession.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
-
 	def BuildImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
@@ -211,13 +281,14 @@ class Containerize():
 	
 		self.testCase_id = HTML.testCase_id
 	
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
-			mySSH.command('mkdir -p tmp/ca/ tmp/entitlement/', '\$', 5)
-			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5)
-			mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5)
+			mySSH.command('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca', '\$', 5)
+			mySSH.command('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf/', '\$', 5)
+			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/', '\$', 5)
+			mySSH.command('sudo cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/', '\$', 5)

 		baseImage = 'ran-base'
 		baseTag = 'develop'
@@ -246,32 +317,10 @@ class Containerize():
 		if forceBaseImageBuild:
 			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + baseImage + ' --tag ' + baseImage + ':' + baseTag + ' --file docker/Dockerfile.base' + self.dockerfileprefix + ' . > cmake_targets/log/ran-base.log 2>&1', '\$', 1600)
 		# First verify if the base image was properly created.
-		status = True
 		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + baseImage + ':' + baseTag, '\$', 5)
+		allImagesSize = {}
 		if mySSH.getBefore().count('o such image') != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
-			status = False
-		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-			if result is not None:
-				imageSize = float(result.group('size'))
-				imageSize = imageSize / 1000
-				if imageSize < 1000:
-					logging.debug('\u001B[1m   ran-base size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-					self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' kbytes'
-				else:
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ran-base size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-						self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' Mbytes'
-					else:
-						imageSize = imageSize / 1000
-						logging.debug('\u001B[1m   ran-base size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-						self.allImagesSize['ran-base'] = str(round(imageSize,1)) + ' Gbytes'
-			else:
-				logging.debug('ran-base size is unknown')
-		# If the base image failed, no need to continue
-		if not status:
 			# Recover the name of the failed container?
 			mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
 			mySSH.command(self.cli + ' image prune --force', '\$', 30)
@@ -281,20 +330,32 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			sys.exit(1)
 		else:
-			# Recover build logs, for the moment only possible when build is successful
-			mySSH.command(self.cli + ' create --name test ' + baseImage + ':' + baseTag, '\$', 5)
-			mySSH.command('mkdir -p cmake_targets/log/ran-base', '\$', 5)
-			mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base', '\$', 5)
-			mySSH.command(self.cli + ' rm -f test', '\$', 5)
+			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+			if result is not None:
+				size = float(result.group("size")) / 1000000
+				imageSizeStr = f'{size:.1f}'
+				logging.debug(f'\u001B[1m   ran-base size is {imageSizeStr} Mbytes\u001B[0m')
+				allImagesSize['ran-base'] = f'{imageSizeStr} Mbytes'
+			else:
+				logging.debug('ran-base size is unknown')
+
+		# Recover build logs, for the moment only possible when build is successful
+		mySSH.command(self.cli + ' create --name test ' + baseImage + ':' + baseTag, '\$', 5)
+		mySSH.command('mkdir -p cmake_targets/log/ran-base', '\$', 5)
+		mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base', '\$', 5)
+		mySSH.command(self.cli + ' rm -f test', '\$', 5)

 		# Build the target image(s)
+		status = True
+		attemptedImages = ['ran-base']
 		for image,pattern in imageNames:
+			attemptedImages += [image]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			mySSH.command('sed -i -e "s#' + baseImage + ':latest#' + baseImage + ':' + baseTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5)
+			mySSH.command(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
 			if image != 'ran-build':
-				mySSH.command('sed -i -e "s#' + "ran-build" + ':latest#' + "ran-build" + ':' + imageTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5)
-			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + image + ' --tag ' + image + ':' + imageTag + ' --file docker/Dockerfile.' + pattern + self.dockerfileprefix + ' . > cmake_targets/log/' + image + '.log 2>&1', '\$', 1200)
+				mySSH.command(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
+			mySSH.command(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', '\$', 1200)
 			# Flatten Image
 			if image != 'ran-build':
 				mySSH.command('python3 ./ci-scripts/flatten_image.py --tag ' + image + ':' + imageTag, '\$', 300)
@@ -308,117 +369,43 @@ class Containerize():
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
 				mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
-				self.allImagesSize[image] = 'N/A -- Build Failed'
+				allImagesSize[image] = 'N/A -- Build Failed'
+				break
 			else:
 				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
 				if result is not None:
-					imageSize = float(result.group('size'))
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-						self.allImagesSize[image] = str(round(imageSize,1)) + ' kbytes'
-					else:
-						imageSize = imageSize / 1000
-						if imageSize < 1000:
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Mbytes'
-						else:
-							imageSize = imageSize / 1000
-							logging.debug('\u001B[1m   ' + image + ' size is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-							self.allImagesSize[image] = str(round(imageSize,1)) + ' Gbytes'
+					size = float(result.group("size")) / 1000000
+					imageSizeStr = f'{size:.1f}'
+					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
+					allImagesSize[image] = f'{imageSizeStr} Mbytes'
 				else:
-					logging.debug('ran-base size is unknown')
-					self.allImagesSize[image] = 'unknown'
+					logging.debug(f'{image} size is unknown')
+					allImagesSize[image] = 'unknown'
 			# Now pruning dangling images in between target builds
 			mySSH.command(self.cli + ' image prune --force', '\$', 30)

-		# Analyzing the logs
-		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
-		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
-
-		mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
-		mySSH.command('rm -f build_log_' + self.testCase_id + '.zip || true', '\$', 5)
-		if (os.path.isfile('./build_log_' + self.testCase_id + '.zip')):
-			os.remove('./build_log_' + self.testCase_id + '.zip')
-		if (os.path.isdir('./build_log_' + self.testCase_id)):
-			shutil.rmtree('./build_log_' + self.testCase_id)
-		mySSH.command('zip -r -qq build_log_' + self.testCase_id + '.zip build_log_' + self.testCase_id, '\$', 5)
-		mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
-		mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
-		# Remove all intermediate build images
+		# Remove all intermediate build images and clean up
 		if self.ranAllowMerge and forceBaseImageBuild:
-			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
-		mySSH.command(self.cli + ' image rm ran-build:' + imageTag + ' || true','\$', 30)
-		# Cleaning any created tmp volume
-		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
-		mySSH.close()
-		ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
+			mySSH.command(f'{self.cli} image rm {baseImage}:{baseTag} || true', '\$', 30)
+		mySSH.command(f'{self.cli} image rm ran-build:{imageTag}','\$', 30)
+		mySSH.command(f'{self.cli} volume prune --force','\$', 15)

-		#Trying to identify the errors and warnings for each built images
-		imageNames1 = imageNames
-		base = ('ran-base','ran')
-		imageNames1.insert(0, base) 
-		for image,pattern in imageNames1:
-			files = {}
-			file_list = [f for f in os.listdir('build_log_' + self.testCase_id + '/' + image) if os.path.isfile(os.path.join('build_log_' + self.testCase_id + '/' + image, f)) and f.endswith('.txt')]
-			for fil in file_list:
-				errorandwarnings = {}
-				warningsNo = 0
-				errorsNo = 0
-				with open('build_log_{}/{}/{}'.format(self.testCase_id,image,fil), mode='r') as inputfile:
-					for line in inputfile:
-						result = re.search(' ERROR ', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' error:', str(line))
-						if result is not None:
-							errorsNo += 1
-						result = re.search(' WARNING ', str(line))
-						if result is not None:
-							warningsNo += 1
-						result = re.search(' warning:', str(line))
-						if result is not None:
-							warningsNo += 1
-					errorandwarnings['errors'] = errorsNo
-					errorandwarnings['warnings'] = warningsNo
-					errorandwarnings['status'] = status
-				files[fil] = errorandwarnings
-			# Let analyze the target image creation part
-			if os.path.isfile('build_log_{}/{}.log'.format(self.testCase_id,image)):
-				errorandwarnings = {}
-				with open('build_log_{}/{}.log'.format(self.testCase_id,image), mode='r') as inputfile:
-					startOfTargetImageCreation = False
-					buildStatus = False
-					for line in inputfile:
-						result = re.search('FROM .* [aA][sS] ' + image + '$', str(line))
-						if result is not None:
-							startOfTargetImageCreation = True
-						if startOfTargetImageCreation:
-							result = re.search('Successfully tagged ' + image + ':', str(line))
-							if result is not None:
-								buildStatus = True
-							result = re.search('COMMIT ' + image + ':', str(line))
-							if result is not None:
-								buildStatus = True
-					inputfile.close()
-					if buildStatus:
-						errorandwarnings['errors'] = 0
-					else:
-						errorandwarnings['errors'] = 1
-					errorandwarnings['warnings'] = 0
-					errorandwarnings['status'] = buildStatus
-					files['Target Image Creation'] = errorandwarnings
-			self.collectInfo[image] = files
+		# create a zip with all logs
+		build_log_name = f'build_log_{self.testCase_id}'
+		CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, lUserName, lPassWord)
+		mySSH.close()
+
+		# Analyze the logs
+		collectInfo = AnalyzeBuildLogs(build_log_name, attemptedImages, status)
 		
 		if status:
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
 			sys.exit(1)

@@ -473,7 +460,7 @@ class Containerize():
 		self.ranCommitID = self.proxyCommit
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		# to prevent accidentally overwriting data that might be used later
 		self.ranCommitID = oldRanCommidID
 		self.ranRepository = oldRanRepository
@@ -532,13 +519,34 @@ class Containerize():
 			# don't delete such that we might recover the zips
 			#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)

+		# we do not analyze the logs (we assume the proxy builds fine at this stage),
+		# but need to have the following information to correctly display the HTML
+		files = {}
+		errorandwarnings = {}
+		errorandwarnings['errors'] = 0
+		errorandwarnings['warnings'] = 0
+		errorandwarnings['status'] = True
+		files['Target Image Creation'] = errorandwarnings
+		collectInfo = {}
+		collectInfo['proxy'] = files
+		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+		allImagesSize = {}
+		if result is not None:
+			imageSize = float(result.group('size')) / 1000000
+			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
+			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+		else:
+			logging.debug('proxy size is unknown')
+			allImagesSize['proxy'] = 'unknown'
+
 		# Cleaning any created tmp volume
 		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
 		mySSH.close()

 		logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
-		HTML.CreateHtmlNextTabHeaderTestRow(self.collectInfo, self.allImagesSize)
+		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

 	def Copy_Image_to_Test_Server(self, HTML):
 		imageTag = 'develop'
@@ -560,9 +568,17 @@ class Containerize():
 			lUserName = self.eNB2UserName
 			lPassWord = self.eNB2Password
 		lSsh.open(lIpAddr, lUserName, lPassWord)
-		lSsh.command('docker save ' + self.imageToCopy + ':' + imageTag + ' | gzip > ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
-		lSsh.copyin(lIpAddr, lUserName, lPassWord, '~/' + self.imageToCopy + '-' + imageTag + '.tar.gz', '.')
+		lSsh.command('docker save ' + self.imageToCopy + ':' + imageTag + ' | gzip --fast > ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		ret = lSsh.copyin(lIpAddr, lUserName, lPassWord, '~/' + self.imageToCopy + '-' + imageTag + '.tar.gz', '.')
+		if ret != 0:
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('cannot remove'):
+			HTML.CreateHtmlTestRow('file not created by docker save', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.close()

 		# Going to the Test Server
@@ -580,15 +596,26 @@ class Containerize():
 			lPassWord = self.eNB2Password
 		lSsh.open(lIpAddr, lUserName, lPassWord)
 		lSsh.copyout(lIpAddr, lUserName, lPassWord, './' + self.imageToCopy + '-' + imageTag + '.tar.gz', '~')
+		# copyout has no return code and will quit if something fails
 		lSsh.command('docker rmi ' + self.imageToCopy + ':' + imageTag, '\$', 10)
 		lSsh.command('docker load < ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('o such file') or lSsh.getBefore().count('invalid tar header'):
+			logging.debug(lSsh.getBefore())
+			HTML.CreateHtmlTestRow('problem during docker load', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.command('rm ' + self.imageToCopy + '-' + imageTag + '.tar.gz', '\$', 60)
+		if lSsh.getBefore().count('cannot remove'):
+			HTML.CreateHtmlTestRow('file not copied during scp?', 'KO', CONST.ALL_PROCESSES_OK)
+			self.exitStatus = 1
+			return False
 		lSsh.close()

 		if os.path.isfile('./' + self.imageToCopy + '-' + imageTag + '.tar.gz'):
 			os.remove('./' + self.imageToCopy + '-' + imageTag + '.tar.gz')

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

 	def DeployObject(self, HTML, EPC):
 		if self.eNB_serverId[self.eNB_instance] == '0':
@@ -614,7 +641,7 @@ class Containerize():
 		mySSH = SSH.SSHConnection()
 		mySSH.open(lIpAddr, lUserName, lPassWord)
 		
-		self._createWorkspace(mySSH, lPassWord, lSourcePath)
+		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)
@@ -637,7 +664,7 @@ class Containerize():
 		result = re.search('service=(?P<svc_name>[a-zA-Z0-9\_]+)', mySSH.getBefore())
 		if result is not None:
 			svcName = result.group('svc_name')
-			mySSH.command('docker-compose --file ci-docker-compose.yml up -d ' + svcName, '\$', 10)
+			mySSH.command('docker-compose --file ci-docker-compose.yml up -d ' + svcName, '\$', 15)

 		# Checking Status
 		mySSH.command('docker-compose --file ci-docker-compose.yml config', '\$', 5)
@@ -664,6 +691,9 @@ class Containerize():
 		logging.debug(' -- ' + str(unhealthyNb) + ' unhealthy container(s)')
 		logging.debug(' -- ' + str(startingNb) + ' still starting container(s)')

+		self.testCase_id = HTML.testCase_id
+		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
+
 		status = False
 		if healthyNb == 1:
 			cnt = 0
@@ -678,11 +708,12 @@ class Containerize():
 					status = True
 					logging.info('\u001B[1m Deploying OAI object Pass\u001B[0m')
 					time.sleep(10)
+		else:
+			# containers are unhealthy, so we won't start. However, logs are stored at the end
+			# in UndeployObject so we here store the logs of the unhealthy container to report it
+			mySSH.command('docker logs ' + containerName + ' > ' + lSourcePath + '/cmake_targets/' + self.eNB_logFile[self.eNB_instance], '\$', 30)
 		mySSH.close()

-		self.testCase_id = HTML.testCase_id
-		self.eNB_logFile[self.eNB_instance] = 'enb_' + self.testCase_id + '.log'
-
 		if status:
 			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
@@ -914,12 +945,26 @@ class Containerize():
 		logging.debug(cmd)
 		subprocess.run(cmd, shell=True)

-		# if the containers are running, recover the logs!
+		# check which containers are running for log recovery later
 		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml ps --all'
 		logging.debug(cmd)
-		deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+		deployStatusLogs = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=30)
+
+		# Stop the containers to shut down objects
+		logging.debug('\u001B[1m Stopping containers \u001B[0m')
+		cmd = 'cd ' + self.yamlPath[0] + ' && docker-compose -f docker-compose-ci.yml stop'
+		logging.debug(cmd)
+		try:
+			deployStatus = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True, timeout=100)
+		except Exception as e:
+			self.exitStatus = 1
+			logging.error('Could not stop containers')
+			HTML.CreateHtmlTestRow('Could not stop', 'KO', CONST.ALL_PROCESSES_OK)
+			logging.error('\u001B[1m Undeploying OAI Object(s) FAILED\u001B[0m')
+			return
+
 		anyLogs = False
-		for state in deployStatus.split('\n'):
+		for state in deployStatusLogs.split('\n'):
 			res = re.search('Name|----------', state)
 			if res is not None:
 				continue
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -453,13 +453,11 @@ class HTMLManagement():
 						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')
 					elif (parameters['warnings'] == 0):
 						self.htmlFile.write('        <td bgcolor = "green" >' + str(parameters['warnings'])  + '</td>\n')
-					elif ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
-						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					else:
-						self.htmlFile.write('        <td bgcolor = "red" >' + str(parameters['warnings'])  + '</td>\n')
+						self.htmlFile.write('        <td bgcolor = "orange" >' + str(parameters['warnings'])  + '</td>\n')
 					if (parameters['errors'] == 0) and (parameters['warnings'] == 0):
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "green" ><font color="white">OK </font></th>\n')
-					elif (parameters['errors'] == 0) and ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)):
+					elif (parameters['errors'] == 0):
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "orange" ><font color="white">OK </font></th>\n')
 					else:
 						self.htmlFile.write('        <th colspan=' + str(1+self.htmlUEConnected) + ' bgcolor = "red" > NOT OK  </th>\n')
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -1329,7 +1329,7 @@ class OaiCiTest():
 		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 		if self.ADBCentralized:
 			SSH.command('adb devices', '\$', 15)
-			self.UEDevices = re.findall("\\\\r\\\\n([A-Za-z0-9]+)\\\\tdevice",SSH.getBefore())
+			self.UEDevices = re.findall('\r\n([A-Za-z0-9]+)\tdevice',SSH.getBefore())
 			#report number and id of devices found
 			msg = "UEDevices found by GetAllUEDevices : " + " ".join(self.UEDevices)
 			logging.debug(msg)
@@ -1379,8 +1379,7 @@ class OaiCiTest():
 		SSH.open(self.ADBIPAddress, self.ADBUserName, self.ADBPassword)
 		if self.ADBCentralized:
 			SSH.command('lsusb | egrep --colour=never "Future Technology Devices International, Ltd FT2232C" | sed -e "s#:.*##" -e "s# #_#g"', '\$', 15)
-			#self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
-			self.CatMDevices = re.findall("\\\\r\\\\n([A-Za-z0-9_]+)",SSH.getBefore())
+			self.CatMDevices = re.findall('\r\n([A-Za-z0-9_]+)',SSH.getBefore())
 		else:
 			if (os.path.isfile('./modules_list.txt')):
 				os.remove('./modules_list.txt')
@@ -2046,7 +2045,7 @@ class OaiCiTest():
 				req_bandwidth = '%.1f Gbits/sec' % req_bw
 				req_bw = req_bw * 1000000000

-		result = re.search('Server Report:\\\\r\\\\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
+		result = re.search('Server Report:\r\n(?:|\[ *\d+\].*) (?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?P<jitter>[0-9\.]+ ms) +(\d+\/..\d+) +(\((?P<packetloss>[0-9\.]+)%\))', SSH.getBefore())
 		if result is not None:
 			bitrate = result.group('bitrate')
 			packetloss = result.group('packetloss')
@@ -2262,7 +2261,7 @@ class OaiCiTest():

 	def Iperf_analyzeV3Output(self, lock, UE_IPAddress, device_id, statusQueue,SSH):

-		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\\\\r\\\\n(?:|\[ *\d+\] Sent \d+ datagrams)\\\\r\\\\niperf Done\.', SSH.getBefore())
+		result = re.search('(?P<bitrate>[0-9\.]+ [KMG]bits\/sec) +(?:|[0-9\.]+ ms +\d+\/\d+ \((?P<packetloss>[0-9\.]+)%\)) +(?:|receiver)\r\n(?:|\[ *\d+\] Sent \d+ datagrams)\r\niperf Done\.', SSH.getBefore())
 		if result is None:
 			result = re.search('(?P<error>iperf: error - [a-zA-Z0-9 :]+)', SSH.getBefore())
 			lock.acquire()
@@ -2405,7 +2404,7 @@ class OaiCiTest():
 			if launchFromTrfContainer:
 				SSH.command('docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"', '\$', 5)
 			else:
-				SSH.command('killall --signal SIGKILL iperf', EPC.UserName, 5)
+				SSH.command('killall --signal SIGKILL iperf', '\$', 5)
 			SSH.close()
 		else:
 			cmd = 'killall --signal SIGKILL iperf'
@@ -3865,7 +3864,7 @@ class OaiCiTest():
 		SSH = sshconnection.SSHConnection()
 		SSH.open(IPAddress, UserName, Password)
 		SSH.command('lsb_release -a', '\$', 5)
-		result = re.search('Description:\\\\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
+		result = re.search('Description:\t(?P<os_type>[a-zA-Z0-9\-\_\.\ ]+)', SSH.getBefore())
 		if result is not None:
 			OsVersion = result.group('os_type')
 			logging.debug('OS is: ' + OsVersion)
@@ -3883,26 +3882,26 @@ class OaiCiTest():
 				logging.debug('OS is: ' + OsVersion)
 				HTML.OsVersion[idx]=OsVersion
 		SSH.command('uname -r', '\$', 5)
-		result = re.search('uname -r\\\\r\\\\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
+		result = re.search('uname -r\r\n(?P<kernel_version>[a-zA-Z0-9\-\_\.]+)', SSH.getBefore())
 		if result is not None:
 			KernelVersion = result.group('kernel_version')
 			logging.debug('Kernel Version is: ' + KernelVersion)
 			HTML.KernelVersion[idx]=KernelVersion
-		SSH.command('dpkg --list | egrep --color=never libuhd003', '\$', 5)
-		result = re.search('libuhd003:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
+		SSH.command('dpkg --list | egrep --color=never libuhd', '\$', 5)
+		result = re.search('libuhd.*:amd64 *(?P<uhd_version>[0-9\.]+)', SSH.getBefore())
 		if result is not None:
 			UhdVersion = result.group('uhd_version')
 			logging.debug('UHD Version is: ' + UhdVersion)
 			HTML.UhdVersion[idx]=UhdVersion
 		else:
-			SSH.command('uhd_config_info --version', '\$', 5)
-			result = re.search('UHD (?P<uhd_version>[a-zA-Z0-9\.\-]+)', SSH.getBefore())
+			SSH.command('uhd_config_info --abi-version', '\$', 5)
+			result = re.search('ABI version string: (?P<uhd_version>[a-zA-Z0-9\.\-]+)', SSH.getBefore())
 			if result is not None:
 				UhdVersion = result.group('uhd_version')
 				logging.debug('UHD Version is: ' + UhdVersion)
 				HTML.UhdVersion[idx]=UhdVersion
 		SSH.command('echo ' + Password + ' | sudo -S uhd_find_devices', '\$', 180)
-		usrp_boards = re.findall('product: ([0-9A-Za-z]+)\\\\r\\\\n', SSH.getBefore())
+		usrp_boards = re.findall('product: ([0-9A-Za-z]+)', SSH.getBefore())
 		count = 0
 		for board in usrp_boards:
 			if count == 0:
@@ -3914,14 +3913,18 @@ class OaiCiTest():
 			logging.debug('USRP Board(s) : ' + UsrpBoard)
 			HTML.UsrpBoard[idx]=UsrpBoard
 		SSH.command('lscpu', '\$', 5)
-		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+).*Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+).*CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
+		result = re.search('CPU\(s\): *(?P<nb_cpus>[0-9]+)', SSH.getBefore())
 		if result is not None:
 			CpuNb = result.group('nb_cpus')
 			logging.debug('nb_cpus: ' + CpuNb)
 			HTML.CpuNb[idx]=CpuNb
+		result = re.search('Model name: *(?P<model>[a-zA-Z0-9\-\_\.\ \(\)]+)', SSH.getBefore())
+		if result is not None:
 			CpuModel = result.group('model')
 			logging.debug('model: ' + CpuModel)
 			HTML.CpuModel[idx]=CpuModel
+		result = re.search('CPU MHz: *(?P<cpu_mhz>[0-9\.]+)', SSH.getBefore())
+		if result is not None:
 			CpuMHz = result.group('cpu_mhz') + ' MHz'
 			logging.debug('cpu_mhz: ' + CpuMHz)
 			HTML.CpuMHz[idx]=CpuMHz
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -56,7 +56,6 @@ class PhySim:
 		self.__workSpacePath=''
 		self.__buildLogFile='compile_phy_sim.log'
 		self.__runLogFile=''
-		self.__runResults=[]
 		self.__runLogPath='phy_sim_logs'


@@ -64,20 +63,20 @@ class PhySim:
 #PRIVATE Methods
 #-----------------

-	def __CheckResults_PhySim(self,HTML,CONST,testcase_id):
+	def __CheckResults_LDPCTest(self,HTML,CONST,testcase_id):
 		mySSH = sshconnection.SSHConnection()
 		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
 		#retrieve run log file and store it locally$
 		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
 		mySSH.close()
 		#parse results looking for Encoding and Decoding mean values
-		self.__runResults=[]
+		runResults=[]
 		with open(self.__runLogFile) as f:
 			for line in f:
 				if 'mean' in line:
-					self.__runResults.append(line)
+					runResults.append(line)
 		#the values are appended for each mean value (2), so we take these 2 values from the list
-		info=self.__runResults[0]+self.__runResults[1]
+		info = runResults[0] + runResults[1]

 		#once parsed move the local logfile to its folder for tidiness
 		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
@@ -89,6 +88,38 @@ class PhySim:
 		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
 		return HTML

+	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		html_queue = SimpleQueue()
+		#retrieve run log file and store it locally
+		mySSH = sshconnection.SSHConnection()
+		filename = self.__workSpacePath + self.__runLogFile
+		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
+		if ret != 0:
+			error_msg = f'could not recover test result file {filename}'
+			logging.error(error_msg)
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', 1, html_queue)
+			self.exitStatus = 1
+			return HTML
+
+		PUSCH_OK = False
+		with open(self.__runLogFile) as f:
+			PUSCH_OK = 'PUSCH test OK' in f.read()
+
+		# once parsed move the local logfile to its folder for tidiness
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+
+		#updating the HTML with results
+		if PUSCH_OK:
+			html_queue.put('<pre style="background-color:white">succeeded</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, html_queue)
+		else:
+			error_msg = 'error: no "PUSCH test OK"'
+			logging.error(error_msg)
+			html_queue.put(f'<pre style="background-color:white">{error_msg}</pre>')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, html_queue)
+			self.exitStatus = 1
+		return HTML

 	def __CheckBuild_PhySim(self, HTML, CONST):
 		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
@@ -100,21 +131,16 @@ class PhySim:
 		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
 		mySSH.close()
 		#check build result from local compile log file
-		buildStatus=False
 		with open(self.__buildLogFile) as f:
-		#nr_prachsim is the last compile step
-			if 'nr_prachsim compiled' in f.read():
-				buildStatus=True
-		#update HTML based on build status
-		if buildStatus:
-			HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'LDPC')
-			self.exitStatus=0
-		else:
-			logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
-			HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
-			HTML.CreateHtmlTabFooter(False)
-			#exitStatus=1 will do a sys.exit in main
-			self.exitStatus=1
+			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
+				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
+				self.exitStatus=0
+				return HTML
+		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
+		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
+		HTML.CreateHtmlTabFooter(False)
+		#exitStatus=1 will do a sys.exit in main
+		self.exitStatus = 1
 		return HTML


@@ -163,8 +189,7 @@ class PhySim:
 		mySSH.command('source oaienv', '\$', 5)
 		mySSH.command('cd cmake_targets', '\$', 5)
 		mySSH.command('mkdir -p log', '\$', 5)
-		mySSH.command('chmod 777 log', '\$', 5)
-		mySSH.command('stdbuf -o0 ./build_oai ' + self.buildargs + ' 2>&1 | stdbuf -o0 tee ' + self.__buildLogFile, 'Bypassing the Tests|build have failed', 1500)
+		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)

 		mySSH.close()
 		#check build status and update HTML object
@@ -173,7 +198,8 @@ class PhySim:
 		return lHTML


-	def Run_PhySim(self,htmlObj,constObj,testcase_id):
+	def Run_LDPCTest(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
 		#create run logs folder locally
 		os.system('mkdir -p ./'+self.__runLogPath)
 		#log file is tc_<testcase_id>.log remotely
@@ -187,5 +213,18 @@ class PhySim:
 		mySSH.close()
 		#return updated HTML to main
 		lHTML = cls_oai_html.HTMLManagement()
-		lHTML=self.__CheckResults_PhySim(htmlObj,constObj,testcase_id)
+		lHTML=self.__CheckResults_LDPCTest(htmlObj,constObj,testcase_id)
+		return lHTML
+
+	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		self.__runLogFile = f'physim_{testcase_id}.log'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		#return updated HTML to main
+		lHTML = self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)
 		return lHTML
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -92,7 +92,7 @@ class PhySim:
 			full_ran_repo_name = self.ranRepository.replace('git/', 'git')
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
-		mySSH.command('echo ' + lPassWord + ' | sudo rm -Rf ' + lSourcePath, '\$', 30)
+		mySSH.command('rm -Rf ' + lSourcePath, '\$', 30)
 		mySSH.command('mkdir -p ' + lSourcePath, '\$', 5)
 		mySSH.command('cd ' + lSourcePath, '\$', 5)
 		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
@@ -100,7 +100,7 @@ class PhySim:
 		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
 		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)

-		mySSH.command('echo ' + lPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		mySSH.command('git clean -x -d -ff', '\$', 30)
 		mySSH.command('mkdir -p cmake_targets/log', '\$', 5)
 		# if the commit ID is provided use it to point to it
 		if self.ranCommitID != '':
@@ -115,33 +115,9 @@ class PhySim:
 				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
 		else:
 			imageTag = "develop"
-		# Check if image is exist on the Red Hat server, before pushing it to OC cluster
-		mySSH.command('sudo podman image inspect --format="Size = {{.Size}} bytes" oai-physim:' + imageTag, '\$', 60)
-		if mySSH.getBefore().count('no such image') != 0:
-			logging.error('\u001B[1m No such image oai-physim\u001B[0m')
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.PHYSIM_IMAGE_ABSENT)
-			RAN.prematureExit = True
-			return
-		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
-			if result is not None:
-				imageSize = float(result.group('size'))
-				imageSize = imageSize / 1000
-				if imageSize < 1000:
-					logging.debug('\u001B[1m   oai-physim size is ' + ('%.0f' % imageSize) + ' kbytes\u001B[0m')
-				else:
-					imageSize = imageSize / 1000
-					if imageSize < 1000:
-						logging.debug('\u001B[1m   oai-physim size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
-					else:
-						imageSize = imageSize / 1000
-						logging.debug('\u001B[1m   oai-physim is ' + ('%.3f' % imageSize) + ' Gbytes\u001B[0m')
-			else:
-				logging.debug('oai-physim size is unknown')

 		# logging to OC Cluster and then switch to corresponding project
-		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword}', '\$', 30)
+		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server https://api.oai.cs.eurecom.fr:6443', '\$', 30)
 		if mySSH.getBefore().count('Login successful.') == 0:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
 			mySSH.close()
@@ -161,46 +137,7 @@ class PhySim:
 		else:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')

-		# Tag the image and push to the OC cluster
-		mySSH.command('oc whoami -t | sudo podman login -u ' + ocUserName + ' --password-stdin https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/ --tls-verify=false', '\$', 30)
-		if mySSH.getBefore().count('Login Succeeded!') == 0:
-			logging.error('\u001B[1m Podman Login to OC Cluster Registry Failed\u001B[0m')
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug('\u001B[1m Podman Login to OC Cluster Registry Successfully\u001B[0m')
-		time.sleep(2)
-		mySSH.command('oc create -f openshift/oai-physim-image-stream.yml || true', '\$', 30)
-		if mySSH.getBefore().count('(AlreadyExists):') == 0 and mySSH.getBefore().count('created') == 0:
-			logging.error(f'\u001B[1m Image Stream "oai-physim" Creation Failed on OC Cluster {ocProjectName}\u001B[0m')
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_IS_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug(f'\u001B[1m   Image Stream "oai-physim" created on OC project {ocProjectName}\u001B[0m')
-		time.sleep(2)
-		mySSH.command(f'sudo podman tag oai-physim:{imageTag} default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 30)
-		time.sleep(2)
-		mySSH.command(f'sudo podman push default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag} --tls-verify=false', '\$', 180)
-		if mySSH.getBefore().count('Storing signatures') == 0:
-			logging.error('\u001B[1m Image "oai-physim" push to OC Cluster Registry Failed\u001B[0m')
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
-			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_IS_FAIL)
-			RAN.prematureExit = True
-			return
-		else:
-			logging.debug('\u001B[1m Image "oai-physim" push to OC Cluster Registry Successfully\u001B[0m')
-
 		# Using helm charts deployment
-		time.sleep(5)
 		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
 		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
 		mySSH.command('helm install physim ./charts/physims/ 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
@@ -213,9 +150,6 @@ class PhySim:
 				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
-			mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 30)
-			mySSH.command('oc delete is oai-physim', '\$', 30)
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 			mySSH.command('oc logout', '\$', 30)
 			mySSH.close()
 			self.AnalyzeLogFile_phySim(HTML)
@@ -244,9 +178,6 @@ class PhySim:
 				mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
 				if re.search('No resources found', mySSH.getBefore()):
 					isFinished1 = True
-			mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 6)
-			mySSH.command('oc delete is oai-physim', '\$', 6)
-			mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 			mySSH.command('oc logout', '\$', 30)
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PHYSIM_DEPLOY_FAIL)
 			HTML.CreateHtmlTestRowPhySimTestResult(self.testSummary,self.testResult)
@@ -304,10 +235,6 @@ class PhySim:
 				isFinished1 = True
 		if isFinished1 == True:
 			logging.debug('\u001B[1m UnDeployed PhySim Successfully on OC Cluster\u001B[0m')
-		mySSH.command(f'sudo podman rmi default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/{self.OCProjectName}/oai-physim:{imageTag}', '\$', 6)
-		mySSH.command('oc delete is oai-physim', '\$', 6)
-		logging.debug('\u001B[1m Deleted the Image and ImageStream\u001B[0m')
-		mySSH.command('sudo podman logout https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/', '\$', 6)
 		mySSH.command('oc logout', '\$', 6)
 		mySSH.close()
 		self.AnalyzeLogFile_phySim(HTML)
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -321,20 +321,6 @@ class StaticCodeAnalysis():
 					if ret is not None:
 						analyzed = True
 					if analyzed:
-						ret = re.search('Nb Files that do NOT follow OAI rules: (?P<nb_errors>[0-9\.]+)', str(line))
-						if ret is not None:
-							nbFilesNotFormatted = int(ret.group('nb_errors'))
-
-						if re.search('=== Files not properly formatted ===', str(line)) is not None:
-							listFiles = True
-						if listFiles:
-							if re.search('Removing intermediate container', str(line)) is not None:
-								listFiles = False
-							elif re.search('Running in|Files not properly formatted', str(line)) is not None:
-								pass
-							else:
-								listFilesNotFormatted.append(str(line).strip())
-
 						if re.search('=== Files with incorrect define protection ===', str(line)) is not None:
 							circularHeaderDependency = True
 						if circularHeaderDependency:
--- a/ci-scripts/conf_files/benetel-5g.conf
+++ b/ci-scripts/conf_files/benetel-5g.conf
@@ -214,7 +214,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
 }
 );

--- a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -198,8 +198,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
+         att_tx         = 6
+         att_rx         = 6;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 115;
--- a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -198,8 +198,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
+         att_tx         = 6
+         att_rx         = 6;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 125;
--- a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -198,8 +198,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 1
         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
+         att_tx         = 6
+         att_rx         = 6;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 120;
--- a/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf
@@ -196,8 +196,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 2
         nb_rx          = 2
-         att_tx         = 0
-         att_rx         = 0;
+         att_tx         = 6
+         att_rx         = 6;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 110;
--- a/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -11,22 +11,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  40960;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 95;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 1;
-                      sd  = 0x112233; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L;

@@ -214,52 +199,6 @@ MACRLCs = (
        }
 );

-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         #clock_src = "external";
-         sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal"
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
--- a/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310_mimo.conf
+++ b/ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310_mimo.conf
@@ -0,0 +1,268 @@
+Active_gNBs = ( "gNB-OAI");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+    ////////// Identification parameters:
+    gNB_ID    =  0xe00;
+    gNB_name  =  "gNB-OAI";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  40960;
+    plmn_list = ({
+                  mcc = 208;
+                  mnc = 95;
+                  mnc_length = 2;
+                  snssaiList = (
+                    {
+                      sst = 1;
+                      sd  = 0x1; // 0 false, else true
+                    },
+                    {
+                      sst = 1;
+                      sd  = 0x112233; // 0 false, else true
+                    }
+                  );
+
+                  });
+
+    nr_cellid = 12345678L;
+
+    ////////// Physical parameters:
+
+    ssb_SubcarrierOffset                                      = 0;
+    pdsch_AntennaPorts                                        = 2;
+    pusch_AntennaPorts                                        = 2;
+    do_CSIRS                                                  = 1;
+    ul_prbblacklist                                           = "51,52,53,54"
+    min_rxtxtime = 6;
+     pdcch_ConfigSIB1 = (
+      {
+        controlResourceSetZero = 12;
+        searchSpaceZero = 0;
+      }
+      );
+
+    servingCellConfigCommon = (
+    {
+ #spCellConfigCommon
+
+      physCellId                                                    = 0;
+
+#  downlinkConfigCommon
+    #frequencyInfoDL
+      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
+      absoluteFrequencySSB                                             = 641280;
+      dl_frequencyBand                                                 = 78;
+      # this is 3600 MHz
+      dl_absoluteFrequencyPointA                                       = 640008;
+      #scs-SpecificCarrierList
+        dl_offstToCarrier                                              = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        dl_subcarrierSpacing                                           = 1;
+        dl_carrierBandwidth                                            = 106;
+     #initialDownlinkBWP
+      #genericParameters
+        # this is RBstart=27,L=48 (275*(L-1))+RBstart
+        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialDLBWPsubcarrierSpacing                                   = 1;
+      #pdcch-ConfigCommon
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                     = 0;
+
+  #uplinkConfigCommon
+     #frequencyInfoUL
+      ul_frequencyBand                                              = 78;
+      #scs-SpecificCarrierList
+      ul_offstToCarrier                                             = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
+      pMax                                                          = 20;
+     #initialUplinkBWP
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 12952;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+        initialULBWPsubcarrierSpacing                               = 1;
+      #rach-ConfigCommon
+        #rach-ConfigGeneric
+          prach_ConfigurationIndex                                  = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+          prach_msg1_FDM                                            = 0;
+          prach_msg1_FrequencyStart                                 = 0;
+          zeroCorrelationZoneConfig                                 = 13;
+          preambleReceivedTargetPower                               = -96;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+          preambleTransMax                                          = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+        powerRampingStep                                            = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+        ra_ResponseWindow                                           = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+        prach_RootSequenceIndex_PR                                  = 2;
+        prach_RootSequenceIndex                                     = 1;
+        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+        #
+        msg1_SubcarrierSpacing                                      = 1,
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+        restrictedSetConfig                                         = 0,
+
+        msg3_DeltaPreamble                                          = 1;
+        p0_NominalWithGrant                                         =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+      ssb_PositionsInBurst_PR                                       = 2;
+      ssb_PositionsInBurst_Bitmap                                   = 1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+      ssb_periodicityServingCell                                    = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+      dmrs_TypeA_Position                                           = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      subcarrierSpacing                                             = 1;
+
+
+  #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+      referenceSubcarrierSpacing                                    = 1;
+      # pattern1
+      # dl_UL_TransmissionPeriodicity
+      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
+
+      ssPBCH_BlockPower                                             = -25;
+  }
+
+  );
+
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// AMF parameters:
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+
+    NETWORK_INTERFACES :
+    {
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "ctrl0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.16.0.1";
+        GNB_INTERFACE_NAME_FOR_NGU               = "ctrl0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.16.0.1";
+        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
+    };
+
+  }
+);
+
+MACRLCs = (
+        {
+        num_cc = 1;
+        local_s_if_name  = "lo:";
+        remote_s_address = "127.0.0.1"; // pnf addr [!]
+        local_s_address  = "127.0.0.2"; // vnf addr
+        local_s_portc    = 50601; // vnf p5 port
+        remote_s_portc   = 50600; // pnf p5 port [!]
+        local_s_portd    = 50611; // vnf p7 port [!]
+        remote_s_portd   = 50610; // pnf p7 port [!]
+        tr_s_preference = "nfapi";
+        tr_n_preference = "local_RRC";
+        }
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+rfsimulator :
+{
+    serveraddr = "server";
+    serverport = "4043";
+    options = (); #("saviq"); or/and "chanmod"
+    modelname = "AWGN";
+    IQfile = "/tmp/rfsimulator.iqs";
+};
+
+security = {
+  # preferred ciphering algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nea0, nea1, nea2, nea3
+  ciphering_algorithms = ( "nea0" );
+
+  # preferred integrity algorithms
+  # the first one of the list that an UE supports in chosen
+  # valid values: nia0, nia1, nia2, nia3
+  integrity_algorithms = ( "nia2", "nia0" );
+
+  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+  drb_ciphering = "yes";
+  drb_integrity = "no";
+};
+
+     log_config :
+     {
+       global_log_level                      ="analysis";
+       hw_log_level                          ="analysis";
+       phy_log_level                         ="analysis";
+       mac_log_level                         ="analysis";
+       rlc_log_level                         ="analysis";
+       pdcp_log_level                        ="analysis";
+       rrc_log_level                         ="analysis";
+       ngap_log_level                        ="analysis";
+    };
+
--- a/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
@@ -17,29 +17,16 @@ nssai_sst=222;
 nssai_sd=123;
 }

-L1s = (
+MACRLCs = (
        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
-	remote_n_address = "127.0.0.1"; //Proxy IP
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50600;
-	remote_n_portc   = 50601;
-	local_n_portd    = 50610;
-	remote_n_portd   = 50611;
-        }  
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
+        num_cc = 1;
+        tr_n_preference = "nfapi";
+        local_n_if_name  = "ens3";
+        remote_n_address = "127.0.0.1"; //Proxy IP
+        local_n_address  = "127.0.0.1";
+        local_n_portc    = 50600;
+        remote_n_portc   = 50601;
+        local_n_portd    = 50610;
+        remote_n_portd   = 50611;
+        }
 );
--- a/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi_target.conf
+++ b/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi_target.conf
@@ -0,0 +1,247 @@
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe01;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 5;
+
+    plmn_list = ( { mcc = 320; mnc = 230; mnc_length = 3; } );
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "3GPP_eNODEB";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2685000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 1;
+      N_RB_DL                 			      = 50;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 1;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      pbch_repetition                                 = "FALSE";
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 0;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 0;
+      pdsch_referenceSignalPower 			      = -27;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 1;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.61.195";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "yes";
+
+    ///X2
+    enable_x2 = "yes";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "172.16.0.1"; # rrc.band7.tm1.nfapi.conf:line 201
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+
+    NETWORK_INTERFACES :
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.2";
+        ENB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.2";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.2";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+        
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	local_s_if_name  = "lo";
+	remote_s_address = "127.0.0.1";
+	local_s_address  = "127.0.0.2";
+	local_s_portc    = 50201;
+	remote_s_portc   = 50200;
+	local_s_portd    = 50211;
+	remote_s_portd   = 50210;
+	tr_s_preference = "nfapi";
+	tr_n_preference = "local_RRC";
+	scheduler_mode = "fairRR";
+        }  
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+log_config =
+    {
+      global_log_level                      ="analysis";
+      hw_log_level                          ="analysis";
+      phy_log_level                         ="analysis";
+      mac_log_level                         ="analysis";
+      rlc_log_level                         ="analysis";
+      pdcp_log_level                        ="analysis";
+      rrc_log_level                         ="analysis";
+   };
--- a/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
@@ -218,16 +218,6 @@ MACRLCs = (
        }
 )

-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 log_config =
    {
      global_log_level                      ="info";
--- a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -11,22 +11,7 @@ gNBs =

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

    nr_cellid = 12345678L;

@@ -215,52 +200,6 @@ MACRLCs = (
        }
 );

-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
-  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf       = "yes"
-         nb_tx          = 1
-         nb_rx          = 1
-         att_tx         = 0
-         att_rx         = 0;
-         bands          = [78];
-         max_pdschReferenceSignalPower = -27;
-         max_rxgain                    = 75;
-         eNB_instances  = [0];
-         #beamforming 1x4 matrix:
-         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-         #clock_src = "external";
-         sdr_addrs = "mgmt_addr=172.21.19.14,addr=192.168.10.2,second_addr=192.168.20.2,clock_source=internal,time_source=internal"
-    }
-);
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
 security = {
  # preferred ciphering algorithms
  # the first one of the list that an UE supports in chosen
--- a/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
@@ -17,29 +17,17 @@ nssai_sst=1;
 nssai_sd=1;
 }

-L1s = (
+MACRLCs = (
        {
-	num_cc = 1;
-	tr_n_preference = "nfapi";
-	local_n_if_name  = "lo:";
-	remote_n_address = "127.0.0.1"; //Proxy IP
-	local_n_address  = "127.0.0.1";
-	local_n_portc    = 50600;
-	remote_n_portc   = 50601;
-	local_n_portd    = 50610;
-	remote_n_portd   = 50611;
-        }  
+        num_cc = 1;
+        tr_n_preference = "nfapi";
+        local_n_if_name  = "lo:";
+        remote_n_address = "127.0.0.1"; //Proxy IP
+        local_n_address  = "127.0.0.1";
+        local_n_portc    = 50600;
+        remote_n_portc   = 50601;
+        local_n_portd    = 50610;
+        remote_n_portd   = 50611;
+        }
 );

-RUs = (
-    {
-       local_rf       = "yes"
-       nb_tx          = 1
-       nb_rx          = 1
-       att_tx         = 90
-       att_rx         = 0;
-       bands          = [7,38,42,43];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 125;
-    }
-);
--- a/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
@@ -180,7 +180,7 @@ eNBs =
                            }
                          );

-    enable_measurement_reports = "no";
+    enable_measurement_reports = "yes";

    ///X2
    enable_x2 = "yes";
--- a/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi_target.conf
+++ b/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi_target.conf
@@ -0,0 +1,248 @@
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe01;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB-Eurecom-LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code = 5;
+
+    plmn_list = ( { mcc = 320; mnc = 230; mnc_length = 3; } );
+
+    tr_s_preference     = "local_mac"
+
+    ////////// Physical parameters:
+
+    component_carriers = (
+      {
+      node_function             = "3GPP_eNODEB";
+      node_timing               = "synch_to_ext_device";
+      node_synch_ref            = 0;
+      frame_type					      = "FDD";
+      tdd_config 					      = 3;
+      tdd_config_s            			      = 0;
+      prefix_type             			      = "NORMAL";
+      eutra_band              			      = 7;
+      downlink_frequency      			      = 2685000000L;
+      uplink_frequency_offset 			      = -120000000;
+      Nid_cell					      = 1;
+      N_RB_DL                 			      = 50;
+      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports                                = 1;
+      nb_antennas_tx          			      = 1;
+      nb_antennas_rx          			      = 1;
+      tx_gain                                            = 90;
+      rx_gain                                            = 125;
+      pbch_repetition                                 = "FALSE";
+      prach_root              			      = 0;
+      prach_config_index      			      = 0;
+      prach_high_speed        			      = "DISABLE";
+      prach_zero_correlation  			      = 1;
+      prach_freq_offset       			      = 2;
+      pucch_delta_shift       			      = 1;
+      pucch_nRB_CQI           			      = 0;
+      pucch_nCS_AN            			      = 0;
+      pucch_n1_AN             			      = 0;
+      pdsch_referenceSignalPower 			      = -27;
+      pdsch_p_b                  			      = 0;
+      pusch_n_SB                 			      = 1;
+      pusch_enable64QAM          			      = "DISABLE";
+      pusch_hoppingMode                                  = "interSubFrame";
+      pusch_hoppingOffset                                = 0;
+      pusch_groupHoppingEnabled  			      = "ENABLE";
+      pusch_groupAssignment      			      = 0;
+      pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+      pusch_nDMRS1                                       = 1;
+      phich_duration                                     = "NORMAL";
+      phich_resource                                     = "ONESIXTH";
+      srs_enable                                         = "DISABLE";
+      /*  srs_BandwidthConfig                                =;
+      srs_SubframeConfig                                 =;
+      srs_ackNackST                                      =;
+      srs_MaxUpPts                                       =;*/
+
+      pusch_p0_Nominal                                   = -96;
+      pusch_alpha                                        = "AL1";
+      pucch_p0_Nominal                                   = -104;
+      msg3_delta_Preamble                                = 6;
+      pucch_deltaF_Format1                               = "deltaF2";
+      pucch_deltaF_Format1b                              = "deltaF3";
+      pucch_deltaF_Format2                               = "deltaF0";
+      pucch_deltaF_Format2a                              = "deltaF0";
+      pucch_deltaF_Format2b		    	      = "deltaF0";
+
+      rach_numberOfRA_Preambles                          = 64;
+      rach_preamblesGroupAConfig                         = "DISABLE";
+      /*
+      rach_sizeOfRA_PreamblesGroupA                      = ;
+      rach_messageSizeGroupA                             = ;
+      rach_messagePowerOffsetGroupB                      = ;
+      */
+      rach_powerRampingStep                              = 4;
+      rach_preambleInitialReceivedTargetPower            = -108;
+      rach_preambleTransMax                              = 10;
+      rach_raResponseWindowSize                          = 10;
+      rach_macContentionResolutionTimer                  = 48;
+      rach_maxHARQ_Msg3Tx                                = 4;
+
+      pcch_default_PagingCycle                           = 128;
+      pcch_nB                                            = "oneT";
+      bcch_modificationPeriodCoeff			      = 2;
+      ue_TimersAndConstants_t300			      = 1000;
+      ue_TimersAndConstants_t301			      = 1000;
+      ue_TimersAndConstants_t310			      = 1000;
+      ue_TimersAndConstants_t311			      = 10000;
+      ue_TimersAndConstants_n310			      = 20;
+      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode                                    = 1;
+
+      //Parameters for SIB18
+      rxPool_sc_CP_Len                                       = "normal";
+      rxPool_sc_Period                                       = "sf40";
+      rxPool_data_CP_Len                                     = "normal";
+      rxPool_ResourceConfig_prb_Num                          = 20;
+      rxPool_ResourceConfig_prb_Start                        = 5;
+      rxPool_ResourceConfig_prb_End                          = 44;
+      rxPool_ResourceConfig_offsetIndicator_present          = "prSmall";
+      rxPool_ResourceConfig_offsetIndicator_choice           = 0;
+      rxPool_ResourceConfig_subframeBitmap_present           = "prBs40";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_buf              = "00000000000000000000";
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_size             = 5;
+      rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused      = 0;
+/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+      rxPool_dataHoppingConfig_numSubbands                            = "ns1";
+      rxPool_dataHoppingConfig_rbOffset                               = 0;
+      rxPool_commTxResourceUC-ReqAllowed                              = "TRUE";
+*/
+      // Parameters for SIB19
+      discRxPool_cp_Len                                               = "normal"
+      discRxPool_discPeriod                                           = "rf32"
+      discRxPool_numRetx                                              = 1;
+      discRxPool_numRepetition                                        = 2;
+      discRxPool_ResourceConfig_prb_Num                               = 5;
+      discRxPool_ResourceConfig_prb_Start                             = 3;
+      discRxPool_ResourceConfig_prb_End                               = 21;
+      discRxPool_ResourceConfig_offsetIndicator_present               = "prSmall";
+      discRxPool_ResourceConfig_offsetIndicator_choice                = 0;
+      discRxPool_ResourceConfig_subframeBitmap_present                = "prBs40";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf          = "f0ffffffff";
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
+
+      }
+    );
+
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+
+    ////////// MME parameters:
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
+                              ipv6       = "192:168:30::17";
+                              port       = 36412 ;
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    enable_measurement_reports = "yes";
+
+    ///X2
+    enable_x2 = "yes";
+    t_reloc_prep      = 1000;      /* unit: millisecond */
+    tx2_reloc_overall = 2000;      /* unit: millisecond */
+    t_dc_prep         = 1000;      /* unit: millisecond */
+    t_dc_overall      = 2000;      /* unit: millisecond */
+    target_enb_x2_ip_address      = (
+                                     { ipv4       = "127.0.0.1"; # proxy_rrc.band7.tm1.nfapi.conf:line 201
+                                       ipv6       = "192:168:30::17";
+                                       preference = "ipv4";
+                                     }
+                                    );
+
+    NETWORK_INTERFACES :
+    {   # All of these have to be IP addr of gNB
+                # if in CORE container, make it 172.16.0.X
+                # if not launched in CORE, can set to lo (127.0.0.2)
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "lo:";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.2";
+        ENB_INTERFACE_NAME_FOR_S1U               = "lo:";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.2";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.2";
+        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
+        
+    };
+  }
+);
+
+MACRLCs = (
+	{
+	num_cc = 1;
+	local_s_if_name  = "lo:";
+	remote_s_address = "127.0.0.1";
+	local_s_address  = "127.0.0.2";
+	local_s_portc    = 50201;
+	remote_s_portc   = 50200;
+	local_s_portd    = 50211;
+	remote_s_portd   = 50210;
+	tr_s_preference = "nfapi";
+	tr_n_preference = "local_RRC";
+	scheduler_mode = "fairRR";
+        }  
+);
+
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
+
+log_config =
+    {
+      global_log_level                      ="info";
+      hw_log_level                          ="info";
+      phy_log_level                         ="info";
+      mac_log_level                         ="info";
+      rlc_log_level                         ="debug";
+      pdcp_log_level                        ="debug";
+      rrc_log_level                         ="debug";
+   };
--- a/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
+++ b/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
@@ -235,16 +235,6 @@ MACRLCs = (
        }
 )

-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
 log_config =
    {
      global_log_level                      ="info";
--- a/ci-scripts/conf_files/gNB_SA_CU.conf
+++ b/ci-scripts/conf_files/gNB_SA_CU.conf
@@ -7,7 +7,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

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

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


    nr_cellid = 12345678L;
--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

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

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


    nr_cellid = 12345678L;
@@ -204,8 +189,7 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 150;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,21 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                                {        
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true 
-                                },
-                                                                                                                                                                   {   
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L 

@@ -231,7 +217,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 150;
 }
--- a/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -7,7 +7,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -16,21 +16,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 99;
-                  mnc_length = 2;
-                  snssaiList = (        
-                                {        
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true 
-                                },
-                                                                                                                                                                   {   
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L 

@@ -228,7 +214,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
 }
 );
--- a/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
@@ -211,7 +211,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
--- a/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
@@ -181,7 +181,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
--- a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
@@ -210,7 +210,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 80;
 }
--- 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
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,25 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x1; // 0 false, else true
-                                },
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });

    nr_cellid = 12345678L

@@ -237,7 +219,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }
--- 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
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,21 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L

@@ -234,7 +220,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }
--- 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
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,21 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });

    nr_cellid = 12345678L

@@ -233,7 +219,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,21 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L

@@ -237,7 +223,7 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
+  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
 }
 );
--- 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
@@ -6,7 +6,7 @@ gNBs =
 (
 {
    ////////// Identification parameters:
-    gNB_CU_ID = 0xe00;
+    gNB_ID = 0xe00;

 #     cell_type =  "CELL_MACRO_GNB";

@@ -15,21 +15,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;

-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 97;
-                  mnc_length = 2;
-                  snssaiList = (
-                                {
-                                  sst = 1;
-                                  sd  = 0x010203; // 0 false, else true
-                                },
-                                                                                                                                                                   {
-                                  sst = 1;
-                                  sd  = 0x112233; // 0 false, else true
-                                }
-                               );
-                 });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0x010203 }) });

    nr_cellid = 12345678L

@@ -235,7 +221,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
 }
--- a/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
@@ -194,7 +194,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 8;
 }
 );

--- a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -210,7 +210,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 6;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );
--- a/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -211,7 +211,6 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  thread_pool_size = 6;
 }
 );

--- a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -11,28 +11,14 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 208;
-                  mnc = 95;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      sd  = 0x1; // 0 false, else true
-                    },
-                    {
-                      sst = 2;
-                      sd  = 2; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) });

    nr_cellid = 12345678L;

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

    min_rxtxtime                                              = 6;
+    enable_sdap = 1;

     pdcch_ConfigSIB1 = (
      {
@@ -217,6 +203,7 @@ L1s = (
        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
+        prach_dtx_threshold = 200;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
    }
 );
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -11,18 +11,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({
-                  mcc = 222;
-                  mnc = 01;
-                  mnc_length = 2;
-                  snssaiList = (
-                    {
-                      sst = 1;
-                      #sd  = 0x1; // 0 false, else true
-                    }
-                  );
-
-                  });
+    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });

    nr_cellid = 12345678L;

--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
@@ -11,22 +11,7 @@ gNBs =

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

    nr_cellid = 12345678L;

--- a/ci-scripts/conf_files/nr-ue-sim.conf
+++ b/ci-scripts/conf_files/nr-ue-sim.conf
@@ -4,5 +4,4 @@ uicc0 = {
  opc= "@OPC@";
  dnn= "@DNN@";
  nssai_sst=@NSSAI_SST@;
-  nssai_sd=@NSSAI_SD@;
 }
--- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -209,8 +209,8 @@ RUs = (
    tr_preference  = "udp_if4p5"
    nb_tx          = 1
    nb_rx          = 1
-    att_tx         = 0
-    att_rx         = 0;
+    att_tx         = 6
+    att_rx         = 6;
    eNB_instances  = [0];
  }
 );
--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -209,8 +209,8 @@ RUs = (
        tr_preference  = "udp_if4p5"
        nb_tx          = 1
        nb_rx          = 1
-        att_tx         = 0
-        att_rx         = 0;
+        att_tx         = 6
+        att_rx         = 6;
        eNB_instances  = [0];
    }
 );  
--- a/ci-scripts/constants.py
+++ b/ci-scripts/constants.py
@@ -46,6 +46,7 @@ ENB_PROCESS_NOLOGFILE_TO_ANALYZE = -14
 ENB_PROCESS_SLAVE_RRU_NOT_SYNCED = -15
 ENB_REAL_TIME_PROCESSING_ISSUE = -16
 ENB_RETX_ISSUE = -17
+ENB_SHUTDOWN_NO_BYE = -18
 HSS_PROCESS_FAILED = -2
 HSS_PROCESS_OK = +2
 MME_PROCESS_FAILED = -3
@@ -78,3 +79,7 @@ X2_HO_REQ_STATE__TARGET_RECEIVES_REQ = 1
 X2_HO_REQ_STATE__TARGET_RRC_RECFG_COMPLETE = 2
 X2_HO_REQ_STATE__TARGET_SENDS_SWITCH_REQ = 3
 X2_HO_REQ_STATE__SOURCE_RECEIVES_REQ_ACK = 10
+
+# placeholder for a "don't care" password to gradually transition to
+# passwordless CI
+CI_NO_PASSWORD = "CIPASSWORDDONTCARE"
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -0,0 +1,34 @@
+#this is a configuration file
+#used to build real time processing statistics
+#for 5G NR phy test (gNB terminate)
+Title : Processing Time (us)
+ColNames :
+  - Metric
+  - Average; Max; Count
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
+Ref :
+  feprx : 48.0
+  feptx_prec : 16.0
+  feptx_ofdm : 35.0
+  feptx_total : 59.0
+  L1 Tx processing : 210.0
+  DLSCH encoding : 129.0
+  L1 Rx processing : 287.0
+  PUSCH inner-receiver : 166.0
+  PUSCH decoding : 176.0
+  Schedule Response : 42.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 55.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -7,18 +7,18 @@ ColNames :
  - Average; Max; Count
  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
-  feprx : 60.0
-  feptx_prec : 8.0
-  feptx_ofdm : 50.0
-  feptx_total : 75.0
-  L1 Tx processing : 300.0
-  DLSCH encoding : 230.0
-  L1 Rx processing : 175.0
-  PUSCH inner-receiver : 100.0
-  #PUSCH decoding : 180.0
-  PUSCH decoding : 240.0
-  DL & UL scheduling timing : 37.0
-  UL Indication : 38.0
+  feprx : 53.0
+  feptx_prec : 20.0
+  feptx_ofdm : 37.0
+  feptx_total : 62.0
+  L1 Tx processing : 170.0
+  DLSCH encoding : 118.0
+  L1 Rx processing : 223.0
+  PUSCH inner-receiver : 107.0
+  PUSCH decoding : 170.0
+  Schedule Response : 15.0
+  DL & UL scheduling timing : 10.0
+  UL Indication : 27.0
 Threshold :
  feprx : 1.25
  feptx_prec : 1.25
@@ -29,5 +29,6 @@ Threshold :
  L1 Rx processing : 1.25
  PUSCH inner-receiver : 1.25
  PUSCH decoding : 1.25
+  Schedule Response : 1.25
  DL & UL scheduling timing : 1.25
  UL Indication : 1.25
--- a/ci-scripts/docker/Dockerfile.formatting.bionic
+++ b/ci-scripts/docker/Dockerfile.formatting.bionic
@@ -8,7 +8,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-       astyle \
       gawk \
       git

@@ -18,9 +17,6 @@ COPY . .
 RUN /bin/bash -c "if [[ -v MERGE_REQUEST ]]; then echo 'Source Branch = $SRC_BRANCH'; echo 'Target Branch = $TARGET_BRANCH'; else echo 'Push to develop'; fi"
 RUN /bin/bash -c "if [[ -v MERGE_REQUEST ]]; then ./ci-scripts/checkCodingFormattingRules.sh --src-branch $SRC_BRANCH --target-branch $TARGET_BRANCH; else ./ci-scripts/checkCodingFormattingRules.sh; fi"

-RUN echo "=== Files not properly formatted ===" && \
-    /bin/bash -c "if [[ -f oai_rules_result_list.txt ]]; then cat oai_rules_result_list.txt; fi"
-
 RUN echo "=== Files with incorrect define protection ===" && \
   /bin/bash -c "if [[ -f header-files-w-incorrect-define.txt ]]; then cat header-files-w-incorrect-define.txt; fi"

--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -253,7 +253,7 @@ class EPCManagement():
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
 			if re.search('start-mini-as-ue', self.cfgDeploy):
 				dFile = 'docker-compose-mini-nrf-asue.yaml'
@@ -537,7 +537,7 @@ class EPCManagement():
 				mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)

 			logging.debug('Terminating OAI CN5G')
-			mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5)
+			mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
 			mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
 			mySSH.command('docker volume prune --force || true', '\$', 60)
 			time.sleep(2)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -45,6 +45,7 @@ import cls_containerize         #class Containerize for all container-based oper
 import cls_static_code_analysis #class for static code analysis
 import cls_ci_ueinfra			#class defining the multi Ue infrastrucure
 import cls_physim1          #class PhySim for physical simulators deploy and run
+import cls_cluster              # class for building/deploying on cluster

 import sshconnection 
 import epc
@@ -102,20 +103,17 @@ def AssignParams(params_dict):


 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy':
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
-		if (forced_workspace_cleanup is None):
-			RAN.Build_eNB_forced_workspace_cleanup=False
-			CONTAINERS.forcedWorkspaceCleanup=False
-		else:
-			if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
-				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=True
-			else:
-				RAN.Build_eNB_forced_workspace_cleanup=True
-				CONTAINERS.forcedWorkspaceCleanup=False
+		RAN.Build_eNB_forced_workspace_cleanup=False
+		CONTAINERS.forcedWorkspaceCleanup=False
+		CLUSTER.forcedWorkspaceCleanup = False
+		if forced_workspace_cleanup is not None and re.match('true', forced_workspace_cleanup, re.IGNORECASE):
+			RAN.Build_eNB_forced_workspace_cleanup = True
+			CONTAINERS.forcedWorkspaceCleanup = True
+			CLUSTER.forcedWorkspaceCleanup = True
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
 			RAN.eNB_instance=0
@@ -457,9 +455,18 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.testSvrId = string_field

-	else: # ie action == 'Run_PhySim':
+	elif action == 'Run_LDPCTest' or action == 'Run_NRulsimTest':
 		ldpc.runargs = test.findtext('physim_run_args')
-		
+
+	elif action == 'LicenceAndFormattingCheck':
+		pass
+
+	elif action == 'Cppcheck_Analysis':
+		pass
+
+	else:
+		logging.error(f"unknown action {action}")
+

 #check if given test is in list
 #it is in list if one of the strings in 'list' is at the beginning of 'test'
@@ -525,6 +532,7 @@ HTML = cls_oai_html.HTMLManagement()
 CONTAINERS = cls_containerize.Containerize()
 SCA = cls_static_code_analysis.StaticCodeAnalysis()
 PHYSIM = cls_physim1.PhySim()
+CLUSTER = cls_cluster.Cluster()

 ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU build

@@ -534,7 +542,7 @@ ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU b
 #-----------------------------------------------------------

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



@@ -914,14 +922,25 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					HTML=ldpc.Build_PhySim(HTML,CONST)
 					if ldpc.exitStatus==1:
 						RAN.prematureExit = True
-				elif action == 'Run_PhySim':
-					HTML=ldpc.Run_PhySim(HTML,CONST,id)
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_NRulsimTest':
+					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Build_Cluster_Image':
+					if not CLUSTER.BuildClusterImage(HTML):
+						RAN.prematureExit = True
 				elif action == 'Build_Image':
 					CONTAINERS.BuildImage(HTML)
 				elif action == 'Build_Proxy':
 					CONTAINERS.BuildProxy(HTML)
 				elif action == 'Copy_Image_to_Test':
-					CONTAINERS.Copy_Image_to_Test_Server(HTML)
+					success = CONTAINERS.Copy_Image_to_Test_Server(HTML)
+					if not success:
+						RAN.prematureExit = True
 				elif action == 'Deploy_Object':
 					CONTAINERS.DeployObject(HTML, EPC)
 					if CONTAINERS.exitStatus==1:
--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
@@ -379,7 +379,7 @@ VM_TEMPLATE=ci-

 # look for ASN1 release in cmake directives
 # It will be the release used when building
-ASN1VEROPT=( `grep "set (RRC_ASN1_VERSION" cmake_targets/CMakeLists.txt` )
+ASN1VEROPT=( `grep "set (RRC_ASN1_VERSION" CMakeLists.txt` )
 ASN1VER=${ASN1VEROPT[2]//\"}
 ASN1VER=${ASN1VER//)}
 unset ASN1VEROPT
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -374,7 +374,7 @@ class RANManagement():
 			mySSH.open(lIpAddr, lUserName, lPassWord)
 			eth_interface = 'any'
 			fltr = 'sctp'
-			logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
+			logging.debug('\u001B[1m Launching tshark on xNB on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 			pcapfile = pcapfile_prefix + self.testCase_id + '_log.pcap'
 			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -f /tmp/' + pcapfile , '\$', 5)
 			mySSH.command('echo $USER; nohup sudo -E tshark  -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + pcapfile + ' > /dev/null 2>&1 &','\$', 5)
@@ -390,7 +390,7 @@ class RANManagement():
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
 			eth_interface = 'any'
 			fltr = 'sctp'
-			logging.debug('\u001B[1m Launching tshark on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
+			logging.debug('\u001B[1m Launching tshark on EPC on interface ' + eth_interface + ' with filter "' + fltr + '"\u001B[0m')
 			self.epcPcapFile = 'enb_' + self.testCase_id + '_s1log.pcap'
 			mySSH.command('echo ' + localEpcPassword + ' | sudo -S rm -f /tmp/' + self.epcPcapFile , '\$', 5)
 			mySSH.command('echo $USER; nohup sudo tshark -f "host ' + lIpAddr +'" -i ' + eth_interface + ' -f "' + fltr + '" -w /tmp/' + self.epcPcapFile + ' > /tmp/tshark.log 2>&1 &', localEpcUserName, 5)
@@ -517,7 +517,7 @@ class RANManagement():
 				localEpcUserName = EPC.UserName
 				localEpcPassword = EPC.Password
 				mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
-				logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+				logging.debug('\u001B[1m Stopping tshark on EPC \u001B[0m')
 				mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 				if self.epcPcapFile  != '':
 					mySSH.command('echo ' + localEpcPassword + ' | sudo -S chmod 666 /tmp/' + self.epcPcapFile, '\$', 5)
@@ -644,18 +644,16 @@ class RANManagement():
 				time.sleep(5)
 		mySSH.command('rm -f my-lte-softmodem-run' + str(self.eNB_instance) + '.sh', '\$', 5)
 		#stopping tshark (valid if eNB and enabled in xml, will not harm otherwise)
-		logging.debug('\u001B[1m Stopping tshark \u001B[0m')
+		logging.debug('\u001B[1m Stopping tshark on xNB \u001B[0m')
 		mySSH.command('echo ' + lPassWord + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 		time.sleep(1)
 		mySSH.close()
-		# If tracer options is on, stopping tshark on EPC side
-		result = re.search('T_stdout', str(self.Initialize_eNB_args))
-		if (result is not None):
+		if EPC.IPAddress != "none" and EPC.IPAddress != '':
 			localEpcIpAddr = EPC.IPAddress
 			localEpcUserName = EPC.UserName
 			localEpcPassword = EPC.Password
+			logging.debug('\u001B[1m Stopping tshark on EPC (' + localEpcIpAddr + ') \u001B[0m')
 			mySSH.open(localEpcIpAddr, localEpcUserName, localEpcPassword)
-			logging.debug('\u001B[1m Stopping tshark \u001B[0m')
 			mySSH.command('echo ' + localEpcPassword + ' | sudo -S killall --signal SIGKILL tshark', '\$', 5)
 			time.sleep(1)
 			if self.epcPcapFile != '':
@@ -814,6 +812,7 @@ class RANManagement():
 		ULRetxIssue = False
 		nrRrcRcfgComplete = 0
 		harqFeedbackPast = 0
+		showedByeMsg = False # last line is Bye. -> stopped properly
 	
 		line_cnt=0 #log file line counter
 		for line in enb_log_file.readlines():
@@ -1026,6 +1025,12 @@ class RANManagement():
 				if result is not None:
 					gnb_markers[k].append(line_cnt)

+			# check whether e/gNB log finishes with "Bye." message
+			# Note that it is "=" not "|=" so not only is the regex
+			# asking for EOF (\Z) but we also only retain the last
+			# line's result
+			showedByeMsg = re.search(r'^Bye.\n\Z', str(line), re.MULTILINE) is not None
+
 		enb_log_file.close()


@@ -1210,6 +1215,13 @@ class RANManagement():
 				logging.debug('No real time stats found in the log file')
 				htmleNBFailureMsg += statMsg

+			if not showedByeMsg:
+				logging.debug('\u001B[1;37;41m ' + nodeB_prefix + 'NB did not show "Bye." message at end, it likely did not stop properly! \u001B[0m')
+				htmleNBFailureMsg += 'No Bye. message found, did not stop properly\n'
+				global_status = CONST.ENB_SHUTDOWN_NO_BYE
+			else:
+				logging.debug('"Bye." message found at end.')
+
 		else:
 			#Removing UE log
 			statMsg = '[MAC] Removing UE msg count =  '+str(removing_ue)
--- a/ci-scripts/reportBuildLocally.sh
+++ b/ci-scripts/reportBuildLocally.sh
@@ -463,106 +463,75 @@ function report_build {
    echo "   </table>" >> ./build_results.html
    echo "   <h2>Build Summary</h2>" >> ./build_results.html

-    if [ -f ./oai_rules_result.txt ]
+    echo "   <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
+    if [ -f ./header-files-w-incorrect-define.txt ]
    then
-        echo "   <h3>OAI Coding / Formatting Guidelines Check</h3>" >> ./build_results.html
-        NB_FILES=`cat ./oai_rules_result.txt`
-        if [ $NB_FILES = "0" ]
-        then 
+        NB_FILES_IN_ERROR=`wc -l ./header-files-w-incorrect-define.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -eq 0 ]
+        then
            echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>All files in repository follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>All modified files in Merge-Request follow OAI rules. <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in modified files</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
            echo "   </div>" >> ./build_results.html
        else
            echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-            if [ $PU_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES files in repository DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
-            if [ $MR_TRIG -eq 1 ]; then echo "      <strong>$NB_FILES modified files in Merge-Request DO NOT follow OAI rules. <span class=\"glyphicon glyphicon-warning-sign\"></span></strong>" >> ./build_results.html; fi
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
            echo "   </div>" >> ./build_results.html
-        fi
-        if [ -f ./oai_rules_result_list.txt ]
-        then
-            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-formatting-details\">More details on formatting check</button>" >> ./build_results.html
-            echo "   <div id=\"oai-formatting-details\" class=\"collapse\">" >> ./build_results.html
-            echo "   <p>Please apply the following command to this(ese) file(s): </p>" >> ./build_results.html
-            echo "   <p style=\"margin-left: 30px\"><strong><code>astyle --options=ci-scripts/astyle-options.txt filename(s)</code></strong></p>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-circular-details\">More details on circular dependency protection check</button>" >> ./build_results.html
+            echo "   <div id=\"oai-circular-details\" class=\"collapse\">" >> ./build_results.html
            echo "   <table border = 1>" >> ./build_results.html
            echo "      <tr>" >> ./build_results.html
-            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Potential Issue</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Impacted File</th>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Incorrect Macro</th>" >> ./build_results.html
            echo "      </tr>" >> ./build_results.html
-            awk '{print "      <tr><td>"$1"</td></tr>"}' ./oai_rules_result_list.txt >> ./build_results.html
+            awk '{if($0 ~/error in/){print "      <tr><td>error in declaration</td><td>"$4"</td><td>"$5"</td></tr>"};if($0 ~/files with same/){print "      <tr><td>files with same #define</td><td>"$5"</td><td>"$6"</td></tr>"}}' ./header-files-w-incorrect-define.txt >> ./build_results.html
            echo "   </table>" >> ./build_results.html
            echo "   </div>" >> ./build_results.html
            echo "   <br>" >> ./build_results.html
        fi
-        if [ -f ./header-files-w-incorrect-define.txt ]
+    fi
+    if [ -f ./files-w-gnu-gpl-license-banner.txt ]
+    then
+        NB_FILES_IN_ERROR=`wc -l ./files-w-gnu-gpl-license-banner.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -ne 0 ]
        then
-            NB_FILES_IN_ERROR=`wc -l ./header-files-w-incorrect-define.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -eq 0 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in modified files</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>No Issue for CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-            else
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository MAY NOT HAVE CIRCULAR DEPENDENCY PROTECTION in the whole repository</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-circular-details\">More details on circular dependency protection check</button>" >> ./build_results.html
-                echo "   <div id=\"oai-circular-details\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Potential Issue</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Impacted File</th>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Incorrect Macro</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{if($0 ~/error in/){print "      <tr><td>error in declaration</td><td>"$4"</td><td>"$5"</td></tr>"};if($0 ~/files with same/){print "      <tr><td>files with same #define</td><td>"$5"</td><td>"$6"</td></tr>"}}' ./header-files-w-incorrect-define.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
+            echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
+            echo "   </div>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-gpl\">More details on GNU GPL license banner issue</button>" >> ./build_results.html
+            echo "   <div id=\"oai-license-gpl\" class=\"collapse\">" >> ./build_results.html
+            echo "   <table border = 1>" >> ./build_results.html
+            echo "      <tr>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "      </tr>" >> ./build_results.html
+            awk '{print "      <tr><td>"$1"</td></tr>"}' ./files-w-gnu-gpl-license-banner.txt >> ./build_results.html
+            echo "   </table>" >> ./build_results.html
+            echo "   </div>" >> ./build_results.html
+            echo "   <br>" >> ./build_results.html
        fi
-        if [ -f ./files-w-gnu-gpl-license-banner.txt ]
+    fi
+    if [ -f ./files-w-suspect-banner.txt ]
+    then
+        NB_FILES_IN_ERROR=`wc -l ./files-w-suspect-banner.txt | sed -e "s@ .*@@"`
+        if [ $NB_FILES_IN_ERROR -ne 0 ]
        then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-gnu-gpl-license-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-danger\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a GNU GPL license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-gpl\">More details on GNU GPL license banner issue</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-gpl\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{print "      <tr><td>"$1"</td></tr>"}' ./files-w-gnu-gpl-license-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
-        fi
-        if [ -f ./files-w-suspect-banner.txt ]
-        then
-            NB_FILES_IN_ERROR=`wc -l ./files-w-suspect-banner.txt | sed -e "s@ .*@@"`
-            if [ $NB_FILES_IN_ERROR -ne 0 ]
-            then
-                echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
-                if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a suspect license banner</strong>" >> ./build_results.html; fi
-                echo "   </div>" >> ./build_results.html
-                echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-suspect\">More details on suspect banner files</button>" >> ./build_results.html
-                echo "   <div id=\"oai-license-suspect\" class=\"collapse\">" >> ./build_results.html
-                echo "   <table border = 1>" >> ./build_results.html
-                echo "      <tr>" >> ./build_results.html
-                echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
-                echo "      </tr>" >> ./build_results.html
-                awk '{print "      <tr><td>"$1"</td></tr>"}' ././files-w-suspect-banner.txt >> ./build_results.html
-                echo "   </table>" >> ./build_results.html
-                echo "   </div>" >> ./build_results.html
-                echo "   <br>" >> ./build_results.html
-            fi
+            echo "   <div class=\"alert alert-warning\">" >> ./build_results.html
+            if [ $MR_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} modified files HAVE a suspect license banner</strong>" >> ./build_results.html; fi
+            if [ $PU_TRIG -eq 1 ]; then echo "   <strong>${NB_FILES_IN_ERROR} files in repository HAVE a suspect license banner</strong>" >> ./build_results.html; fi
+            echo "   </div>" >> ./build_results.html
+            echo "   <button data-toggle=\"collapse\" data-target=\"#oai-license-suspect\">More details on suspect banner files</button>" >> ./build_results.html
+            echo "   <div id=\"oai-license-suspect\" class=\"collapse\">" >> ./build_results.html
+            echo "   <table border = 1>" >> ./build_results.html
+            echo "      <tr>" >> ./build_results.html
+            echo "        <th bgcolor = \"lightcyan\" >Filename</th>" >> ./build_results.html
+            echo "      </tr>" >> ./build_results.html
+            awk '{print "      <tr><td>"$1"</td></tr>"}' ././files-w-suspect-banner.txt >> ./build_results.html
+            echo "   </table>" >> ./build_results.html
+            echo "   </div>" >> ./build_results.html
+            echo "   <br>" >> ./build_results.html
        fi
    fi

--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -1217,7 +1217,7 @@ function start_rf_sim_nr_ue {
        then
            echo "echo \"./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --log_config.global_log_options level,nocolor,time\" > ./my-nr-softmodem-run.sh " >> $1
        else # -eq 3 SA test 24PRB 
-           echo "echo \"./nr-uesoftmodem -r 24 -s 24 --numerology 1 --band 78 -C 3604320000 --rfsim --sa --log_config.global_log_options level,nocolor,time\" > ./my-nr-softmodem-run.sh " >> $1
+           echo "echo \"./nr-uesoftmodem -r 24 --ssb 24 --numerology 1 --band 78 -C 3604320000 --rfsim --sa --log_config.global_log_options level,nocolor,time\" > ./my-nr-softmodem-run.sh " >> $1
        fi
    fi
    echo "chmod 775 ./my-nr-softmodem-run.sh" >> $1
--- a/ci-scripts/run_sl_batch.sh
+++ b/ci-scripts/run_sl_batch.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+remote_host_ip=10.1.1.80 # to test on N310
+user_id=$USER
+
+message_to_send=EpiScience
+num_repeat=1
+
+# change test type accordingly
+test_type='rfsim'
+test_type_cmd="--test "$test_type
+
+if [ $test_type != 'rfsim' ]; then
+    atten_list=(0 5 10 15 20 25 30 35 39 40)
+    test_params=("${atten_list[@]}")
+    param_name='att'
+else
+    param_name='snr'
+fi
+
+start_mcs=0
+end_mcs=9
+step_mcs=1
+mcs_list=()
+
+for i in $(seq $start_mcs $step_mcs $end_mcs); do
+    mcs_list+=($i)
+done
+
+step_snr=0.2
+start_snr=-10
+
+TEST_FOLDER=$HOME/test_$test_type
+[ -d $TEST_FOLDER ] || mkdir $TEST_FOLDER
+
+for j in ${!mcs_list[@]}; do
+    if [ $test_type = 'rfsim' ]; then
+        snr_list=()
+        if [ ${mcs_list[$j]} -ge 0 ] && [ ${mcs_list[$j]} -le 5 ]; then
+            end_snr=6
+        elif [ ${mcs_list[$j]} -ge 6 ] && [ ${mcs_list[$j]} -le 8 ]; then
+            end_snr=10
+        else
+            start_snr=-6
+            end_snr=14
+        fi
+        for k in $(seq $start_snr $step_snr $end_snr); do
+            snr_list+=($k)
+        done
+        test_params=("${snr_list[@]}")
+    fi
+    for k in ${!test_params[@]}; do
+        if [ $test_type = 'rfsim' ]; then
+            param_cmd='--snr '${test_params[$k]}
+        else
+            param_cmd='--att '${test_params[$k]}
+        fi
+            python3 run_sl_test.py --repeat $num_repeat \
+                    -u $user_id --host $remote_host_ip \
+                    --mcs ${mcs_list[$j]} \
+                    $param_cmd \
+                    --save $TEST_FOLDER/mcs_${mcs_list[$j]}_${param_name}_${test_params[$k]}.txt \
+                    $test_type_cmd \
+                    --duration 20
+    done
+done
--- a/ci-scripts/run_sl_test.py
+++ b/ci-scripts/run_sl_test.py
@@ -0,0 +1,490 @@
+#!/usr/bin/env python3
+#
+# Automated tests for running 5G NR Sidelink SyncRef UE and/or Nearby UE.
+# The following is an example to run remote machine (nearby) three times.
+# The syncref UE is launched on the current machine, and a single
+# nearby UE is launched on the machine specified by the --host and
+# --user flags. The -r will enable this simulation to be repeated
+# three times.
+#
+# python3 run_sl_test.py --user account --host 10.1.1.68 -r 3 --test usrp
+#
+# The following is an example to run just a Sidelink Nearby UE.
+# By specifying -l nearby, only the nearby UE will be launched
+# on the machine specified by the --host and --user flags.
+# The -r will enable this simulation to be repeated two times.
+#
+# python3 run_sl_test.py -l nearby --user account --host 10.1.1.68 -r 2 --test usrp
+#
+# To run usrp test in the net 1 specified in sl_net_config.json, the following will be used.
+#
+# python3 run_sl_test.py --test usrp --net 1
+#
+# See `--help` for more information.
+#
+
+import os
+import sys
+import argparse
+import logging
+import time
+import re
+import glob
+import json
+import subprocess, shlex
+from subprocess import Popen
+from subprocess import check_output
+from collections import defaultdict
+import threading
+from typing import Dict
+from queue import Queue
+from sl_check_log import LogChecker
+
+HOME_DIR = os.path.expanduser( '~' )
+
+# ----------------------------------------------------------------------------
+# Command line argument parsing
+
+parser = argparse.ArgumentParser(description="""
+Automated tests for 5G NR Sidelink simulations
+""")
+
+parser.add_argument('--launch', '-l', default='all', choices='syncref nearby all'.split(), help="""
+Sidelink UE type to launch test scenario (default: %(default)s)
+""")
+
+parser.add_argument('--host', default='', type=str, help="""
+Nearby Host IP (default: %(default)s)
+""")
+
+parser.add_argument('--user', '-u', default=os.environ.get('USER'), type=str, help="""
+User id in Nearby Host (default: %(default)s)
+""")
+
+parser.add_argument('--att', type=int, default=-1, help="""
+Attenuation value
+""")
+
+parser.add_argument('--att-host', default='10.1.1.78', type=str, help="""
+Host IP for adjusting attenuation (default: %(default)s)
+""")
+
+parser.add_argument('--att-user', default=os.environ.get('USER'), type=str, help="""
+User id for adjusting attenuation (default: %(default)s)
+""")
+
+parser.add_argument('--basic', '-b', action='store_true', help="""
+Basic test with basic shell commands
+""")
+
+parser.add_argument('--config', default='sl_net_config.json', help="""
+The network configurations .json file (default: %(default)s)
+""")
+
+parser.add_argument('--compress', action='store_true', help="""
+Compress the log files in the --log-dir
+""")
+
+parser.add_argument('--dest', type=str, default='', help="""
+Destination node identifier for sidelink communication (default: %(default)s)
+""")
+
+parser.add_argument('--duration', '-d', metavar='SECONDS', type=int, default=20, help="""
+How long to run the test before stopping to examine the logs
+""")
+
+parser.add_argument('--log-dir', default=HOME_DIR, help="""
+Where to store log files
+""")
+
+parser.add_argument('--message', '-m', type=str, default='', help="""
+The message to send from SyncRef UE to Nearby UE
+""")
+
+parser.add_argument('--mcs', default=0, type=int, help="""
+The default mcs value (default: %(default)s)
+""")
+
+parser.add_argument('--net', '-n', type=int, default=1, help="""
+Network identifier for sidelink communication (default: %(default)s)
+""")
+
+parser.add_argument('--nid1', type=int, default=10, help="""
+Nid1 value
+""")
+
+parser.add_argument('--nid2', type=int, default=1, help="""
+Nid2 value
+""")
+
+parser.add_argument('--no-run', action='store_true', help="""
+Don't run the test, only examine the logs in the --log-dir
+directory from a previous run of the test
+""")
+
+parser.add_argument('--debug', action='store_true', help="""
+Enable debug logging (for this script only)
+""")
+
+parser.add_argument('--repeat', '-r', default=1, type=int, help="""
+The number of repeated test iterations (default: %(default)s)
+""")
+
+parser.add_argument('--save', default=None, help="""
+The default Python log result with .txt extension (default: %(default)s)
+""")
+
+parser.add_argument('--sci2', action='store_true', help="""
+Enable SCI2 log parsing (this will grep the logs for the SCI2 payload)
+""")
+
+parser.add_argument('--test', '-t', default='rfsim', choices='rfsim usrp psbchsim psschsim'.split(), help="""
+The kind of test scenario to run. The options include rfsim, usrp, psbchsim, and psschsim. (default: %(default)s)
+""")
+
+parser.add_argument('--snr', default='0.0', help="""
+Setting snr values (default: %(default)s)
+""")
+
+OPTS = parser.parse_args()
+del parser
+
+logging.basicConfig(level=logging.DEBUG if OPTS.debug else logging.INFO,
+                    format='>>> %(name)s: %(levelname)s: %(message)s')
+LOGGER = logging.getLogger(os.path.basename(sys.argv[0]))
+
+if OPTS.save:
+    out_fh = logging.FileHandler(filename=OPTS.save, mode='a')
+    LOGGER.addHandler(out_fh)
+# ----------------------------------------------------------------------------
+def redirect_output(cmd: str, filename: str) -> str:
+    cmd += f' >{filename} 2>&1'
+    return cmd
+
+def thread_delay(delay: int) -> None:
+    count = 0
+    while count < 1:
+        time.sleep(delay)
+        count += 1
+
+class Config:
+    """
+    Parsing config file
+    """
+    def __init__(self, filename) -> None:
+        self.check_user()
+        self.filename = self.check_file(filename)
+        self.test = OPTS.test.lower()
+        self.parse_config_json()
+
+    def check_user(self) -> None:
+        if 'usrp' != OPTS.test:
+            return
+        if OPTS.launch != 'syncref' and OPTS.user == '':
+            LOGGER.error("--user followed by [user id] is mandatory to connect to remote machine")
+            sys.exit(1)
+
+    def check_file(self, filename) -> str:
+        data_file = glob.glob(filename)
+        if data_file:
+            return filename
+        LOGGER.error('The file %s does not exist!', filename)
+        sys.exit(1)
+
+    def parse_config_json(self) -> None:
+        """
+        Parse configurations from the json file
+        """
+        self.launch_cmds = defaultdict(list)
+        self.hosts = defaultdict(list)
+
+        with open(self.filename) as in_fh:
+            json_data = json.load(in_fh)
+            if f"net_{OPTS.net}" in json_data[self.test].keys():
+                net_config = json_data[self.test][f"net_{OPTS.net}"]
+            else:
+                LOGGER.error('net %d configuration does not exist.', OPTS.net)
+                sys.exit(1)
+            for net in net_config:
+                role = net['role']
+                self.launch_cmds[role].append(net["cmd"])
+                self.hosts[role].append(net["ip"])
+
+        if not self.launch_cmds:
+            LOGGER.error('%s commands are not found in file: %s', self.test, self.filename)
+            sys.exit(1)
+        if OPTS.test.lower() == 'usrp' and not self.hosts['nearby']:
+            LOGGER.error(f'Nearby host IP is expected. Add nearby host IP to {OPTS.config}')
+            sys.exit(1)
+
+class Node:
+    def __init__(self, id: str, role: str, host: str, cmd:str):
+        self.id = id  # Assumption: UE node id starts from 1.
+        self.role = role
+        self.host = host
+        self.delay = self._get_delay(OPTS.test)
+        self.log_file_path = os.path.join(OPTS.log_dir, f'{role}{id}.log')
+        syncref_node_id = '1' if id != '' else  '' # str(int(id) - 1)
+        syncref_node_role = 'syncref' # if id in ('', '1', '2') else 'nearby' # Used for multi hop case.
+        self.syncref_log_file_path = os.path.join(OPTS.log_dir, f'{syncref_node_role}{syncref_node_id}.log')
+        self.cmd = self._update_cmd(role, cmd)
+        self.passed_metric = []
+        self.num_tx_ssb = []
+        self.num_passed = 0
+        self.total_rx_list = []
+        self.nb_decoded_list = []
+        self.pssch_rsrp_list = []
+        self.ssb_rsrp_list = []
+        self.sync_duration_list = []
+
+    def __str__(self):
+        return f'{self.role}{self.id}'
+
+    def _get_delay(self, test_type: str) -> int:
+        """
+        Adjusting launching time by setting delay.
+        """
+        if test_type == 'usrp':
+            return 5 if self.role == 'syncref' else (1 if self.id in ('', '1', '2') else 0)
+        else:
+            return 0 if self.role == 'syncref' else (2 if self.id in ('', '1', '2') else 7)
+
+    def _update_cmd(self, role:str, cmd:str) -> str:
+        if OPTS.basic: return redirect_output('uname -a', self.log_file_path)
+        dest = '' if '--dest' in cmd or OPTS.dest == '' else f' --dest {OPTS.dest}'
+        tx_msg = f" --message '{OPTS.message}'" if len(OPTS.message) > 0 else ""
+        if role == 'syncref':
+            cmd = cmd + tx_msg + f' --mcs {OPTS.mcs}' + dest
+            if 'rfsim' == OPTS.test:
+                cmd += f' --snr {OPTS.snr}'
+        if role == 'nearby':
+            if 'usrp' == OPTS.test:
+                cmd = cmd[:-1] + tx_msg + f' --mcs {OPTS.mcs}' + cmd[-1] # -1 is ' index (end of cmd)
+                cmd = cmd + f' -d {OPTS.duration} --nid1 {OPTS.nid1} --nid2 {OPTS.nid2}'
+            else:
+                cmd = cmd + tx_msg + f' --mcs {OPTS.mcs}'
+                if 'rfsim' == OPTS.test:
+                    cmd += f' --snr {OPTS.snr}'
+        return cmd
+
+    def get_metric(self, log_agent: LogChecker, itrn_inx: int) -> None:
+        if self.num_passed != len(self.passed_metric):
+            # Examine the logs to determine if the test passed
+            (pssch_rsrp, ssb_rsrp, nb_decoded, total_rx, sync_duration) = self.passed_metric[-1]
+            num_ssb = log_agent.analyze_syncref_logs(sync_duration, self.syncref_log_file_path)
+            self.num_tx_ssb += [num_ssb]
+            self.total_rx_list += [total_rx]
+            self.sync_duration_list += [sync_duration]
+            self.nb_decoded_list += [nb_decoded]
+            self.pssch_rsrp_list += [pssch_rsrp]
+            self.ssb_rsrp_list += [ssb_rsrp]
+            LOGGER.info(f"Trial {itrn_inx + 1}/{OPTS.repeat} SYNCHED. {num_ssb} SSB(s) were generated. Measured {ssb_rsrp} RSRP (dbm/RE)")
+        else:
+            LOGGER.info(f"No metric available due to sync failure in {itrn_inx + 1}/{OPTS.repeat} trial(s).")
+        self.num_passed = len(self.passed_metric)
+
+    def show_metric(self) -> None:
+        LOGGER.info('-' * 42)
+        atten_snr = {"rfsim": f'SNR value {OPTS.snr}', "usrp": f'Attenuation value {OPTS.att}'}
+        LOGGER.info(f"{atten_snr[OPTS.test]}, MCS value {OPTS.mcs}")
+
+        LOGGER.info(f"Number of synced = {len(self.passed_metric)}/{OPTS.repeat}")
+        if len(self.num_tx_ssb) > 0:
+            LOGGER.info(f"Avg number of SSB = {sum(self.num_tx_ssb) / len(self.num_tx_ssb)} ({self.num_tx_ssb})")
+        if len(self.passed_metric) > 0:
+            sum_nb_decoded, sum_total_rx = sum(self.nb_decoded_list), sum(self.total_rx_list)
+            avg_bler = (float) (sum_total_rx - sum_nb_decoded) / sum_total_rx if sum_total_rx > 0 else 1
+            avg_bldr = (float) (sum_nb_decoded) / sum_total_rx if sum_total_rx > 0 else 1
+            LOGGER.info(f"Avg PSSCH RSRP = {sum(self.pssch_rsrp_list) / len(self.passed_metric):.2f}")
+            LOGGER.info(f"Avg SSB RSRP = {sum(self.ssb_rsrp_list) / len(self.passed_metric):.2f}")
+            if sum_total_rx > 0:
+                LOGGER.info(f"Avg BLER = {avg_bler:.9f} with {sum_total_rx - sum_nb_decoded} / {sum_total_rx}")
+                LOGGER.info(f"Avg BLDecodedRate = {avg_bldr:.9f} with {sum_nb_decoded} / {sum_total_rx}")
+            LOGGER.info(f"Avg Sync duration (seconds) = {sum(self.sync_duration_list) / len(self.passed_metric):.2f}")
+            LOGGER.info(f"pssch_rsrp_list = {self.pssch_rsrp_list}")
+            LOGGER.info(f"ssb_rsrp_list = {self.ssb_rsrp_list}")
+            LOGGER.info(f"nb_decoded_list = {self.nb_decoded_list}")
+            LOGGER.info(f"total_rx_list = {self.total_rx_list}")
+        LOGGER.info('#' * 42)
+
+class TestThread(threading.Thread):
+    """
+    Represents TestThread
+    """
+    def __init__(self, queue, log_agent):
+        threading.Thread.__init__(self)
+        self.queue = queue
+        self.delay = 0
+        self.log_agent = log_agent
+
+    def run(self):
+        if self.queue.empty():
+            LOGGER.error("Queue is empty!")
+            sys.exit(1)
+        try:
+            while not self.queue.empty():
+                job = self.queue.get()
+                if "nearby" == job.role and not OPTS.no_run:
+                    thread_delay(self.delay + job.delay)
+                    if 'usrp' == OPTS.test:
+                        self.launch_nearby_usrp(job)
+                    elif 'rfsim' == OPTS.test:
+                        self.launch_nearby_rfsim(job)
+                if "syncref" == job.role and not OPTS.no_run:
+                    thread_delay(self.delay + job.delay)
+                    self.launch_syncref(job)
+            self.queue.task_done()
+        except Exception as inst:
+            LOGGER.info(f"Failed to operate on job with type {type(inst)} and args {inst.args}")
+
+    def launch_syncref(self, job: Node) -> Popen:
+        LOGGER.info(f'Launching SyncRef UE {job}')
+        proc = Popen(job.cmd, shell=True)
+        LOGGER.info(f"syncref_proc = {proc}")
+        if not OPTS.basic and not OPTS.no_run:
+            LOGGER.info(f"Process running... {job}")
+            time.sleep(OPTS.duration + 10)
+            self.kill_process(job, proc)
+
+    def launch_nearby_usrp(self, job: Node) -> Popen:
+        LOGGER.info(f'Launching Nearby UE {job}')
+        proc = Popen(["ssh", f"{OPTS.user}@{job.host}", job.cmd],
+                    shell=False,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE)
+        LOGGER.info(f"nearby_proc = {proc}")
+        remote_output = proc.stdout.readlines()
+        if remote_output == []:
+            nearby_result = proc.stderr.readlines()
+        else:
+            nearby_result = remote_output
+        self.kill_process(job, proc)
+        if nearby_result:
+            self.find_nearby_result_metric(job, nearby_result)
+
+    def launch_nearby_rfsim(self, job: Node) -> Popen:
+        LOGGER.info(f'Launching Nearby UE {job}')
+        proc = Popen(job.cmd, shell=True)
+        LOGGER.info(f"nearby_proc = {proc}")
+        if not OPTS.basic and not OPTS.no_run:
+            LOGGER.info(f"Process running... {job}")
+            time.sleep(OPTS.duration)
+            self.kill_process(job, proc)
+            if proc:
+                time.sleep(5)
+        nearby_result, user_msg = self.log_agent.analyze_nearby_logs(OPTS.nid1, OPTS.nid2, OPTS.sci2, job.log_file_path)
+        if nearby_result:
+            self.find_nearby_result_metric(job, [nearby_result])
+
+    def find_nearby_result_metric(self, job: Node, remote_log) -> None:
+        result_metric = None
+        for line in remote_log:
+            if type(line) is not str:
+                line = line.decode()
+            if 'usrp' == OPTS.test:
+                LOGGER.info(line.strip())
+            # 'SyncRef UE found. PSSCH-RSRP: -102 dBm/RE SSS-RSRP: -100 dBm/RE passed 99 total 100 It took {delta_time_s} seconds'
+            if 'SyncRef UE found' in line:
+                fields = line.split(maxsplit=20)
+                if len(fields) > 6:
+                    pssch_rsrp = float(fields[-13])
+                    ssb_rsrp = float(fields[-10])
+                    nb_decoded = int(fields[-7])
+                    total_rx = int(fields[-5])
+                    sync_duration = float(fields[-2])
+                    result_metric = (pssch_rsrp, ssb_rsrp, nb_decoded, total_rx, sync_duration)
+                    job.passed_metric += [result_metric]
+                    return
+
+    def kill_process(self, job: Node, proc: Popen) -> None:
+        # Wait for the processes to end
+        passed = True
+        if proc:
+            status = proc.poll()
+            if status is None:
+                LOGGER.info('process is still running, which is good')
+            else:
+                passed = False
+                LOGGER.info(f'{job} process ended early: {status}')
+        if proc and passed:
+            LOGGER.info(f'kill main simulation processes... {job}')
+            cmd = ['sudo', 'killall']
+            cmd.append('-KILL')
+            cmd.append('nr-uesoftmodem')
+            if "syncref" == job.role:
+                subprocess.run(cmd)
+            LOGGER.info(f'Waiting for PID proc.pid for {job}')
+            proc.kill()
+            proc.wait()
+        LOGGER.info(f'kill main simulation processes...done for {job}')
+
+# ----------------------------------------------------------------------------
+
+def set_attenuation(attenuation: int, atten_host: str, user: str) -> None:
+    """
+    Attenuation value will be updated only if non-negative is specified by user.
+    """
+    if OPTS.att >= 0:
+        LOGGER.info('Setting attenuation')
+        atten_set_cmd = f"curl http://169.254.10.10/:CHAN:1:2:3:4:SETATT:{attenuation}" #CHAN:1:2:3:4:SETATT:25.5
+        atten_get_cmd = f"curl http://169.254.10.10/:ATT?"
+        host_IPs = check_output(['hostname', '-I']).decode().strip().split()
+        LOCAL_IP = host_IPs[1] if len(host_IPs) > 1 else host_IPs[0]
+        atten_cmds = [atten_set_cmd, atten_get_cmd]
+        cmd = shlex.split('; '.join(atten_cmds)) if atten_host == LOCAL_IP else ["ssh", f"{user}@{atten_host}"] + atten_cmds
+        proc = Popen(cmd,
+                    shell=False,
+                    text=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE)
+        out = proc.communicate(timeout=5)[0].strip().split('\n')[-1]
+        LOGGER.info(f"attenuation value {attenuation} among: {out}")
+        time.sleep(1)
+
+def generate_jobs(config: Config) -> list:
+    jobs, node_id, host = [], '', OPTS.host
+    if config.launch_cmds is not None:
+        for role, cmd_list in config.launch_cmds.items():
+            for cmd in cmd_list:
+                if 'node-number' in cmd:
+                    node_id = cmd.split('node-number', 1)[-1].split(maxsplit=1)[0]
+                if role == 'nearby' and OPTS.host == '':
+                    host = config.hosts[role].pop(0)
+                if OPTS.launch == 'all':
+                    jobs.append(Node(node_id, role, host, cmd))
+                elif role == OPTS.launch:
+                    jobs.append(Node(node_id, role, host, cmd))
+                LOGGER.debug(f'{role}{node_id} UE IP : {host}')
+                LOGGER.debug(f'{role}{node_id} UE cmd: {cmd}')
+    if OPTS.test == 'usrp': jobs.reverse()
+    return jobs
+
+def main() -> int:
+    """
+    Main function to run sidelink test repeatedly for a given attenuation value.
+    """
+    config = Config(OPTS.config)
+    log_agent = LogChecker(OPTS, LOGGER)
+    LOGGER.debug(f'Number of iterations {OPTS.repeat}')
+    jobs = generate_jobs(config)
+    if 'usrp' == OPTS.test:
+        set_attenuation(OPTS.att, OPTS.att_host, OPTS.att_user)
+    for i in range(OPTS.repeat):
+        LOGGER.info('-' * 42)
+        threads = []
+        queue = Queue()
+        for job in jobs:
+            queue.put(job)
+            th = TestThread(queue, log_agent)
+            th.setDaemon(True)
+            th.start()
+            threads.append(th)
+        for th in threads:
+            th.join()
+        for job in [job for job in jobs if job.role == 'nearby']:
+            job.get_metric(log_agent, i)
+            job.show_metric()
+        time.sleep(10)
+    return 0
+
+sys.exit(main())
--- a/ci-scripts/sl_check_log.py
+++ b/ci-scripts/sl_check_log.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+
+import os
+import bz2
+from typing import Generator
+
+class LogChecker():
+    def __init__(self, OPTS, LOGGER):
+        self.OPTS = OPTS
+        self.LOGGER = LOGGER
+
+    def get_lines(self, filename: str) -> Generator[str, None, None]:
+        """
+        Yield each line of the given log file (.bz2 compressed log file if -c flag is used.)
+        """
+        fh = bz2.open(filename, 'rb') if self.OPTS.compress else open(filename, 'rb')
+        for line_bytes in fh:
+            line = line_bytes.decode('utf-8', 'backslashreplace')
+            line = line.rstrip('\r\n')
+            yield line
+
+    def get_analysis_messages_nearby(self, filename: str) -> Generator[str, None, None]:
+        """
+        Finding all logs in the log file and yields each line.
+        """
+        self.LOGGER.info('Scanning %s', filename)
+        for line in self.get_lines(filename):
+            yield line
+
+    def analyze_nearby_logs(self, exp_nid1: int, exp_nid2: int, sci2: bool, log_file: str) -> bool:
+        """
+        Checking matched sync logs of Nearby UE.
+        """
+        found = set()
+        est_nid1, est_nid2, time_start_s, time_end_s = -1, -1, -1, -1
+        ssb_rsrp = 0
+        nb_decoded = 0
+        total_rx = 0
+        result = None
+        user_msg = None
+
+        if self.OPTS.compress:
+            log_file = f'{log_file}.bz2'
+        for line in self.get_analysis_messages_nearby(log_file):
+            #796821.854505 [NR_PHY] SyncRef UE found with Nid1 10 and Nid2 1 SS-RSRP -100 dBm/RE
+            #796811.532881 [NR_PHY] nrUE configured
+
+            if not line.startswith('[') and 'SyncRef UE found' in line and 'Nid1' in line and 'Nid2' in line:
+                num_split = 13 if 'RSRP' in line else 10
+                fields = line.split(maxsplit=num_split)
+                est_nid1 = int(fields[7])
+                est_nid2 = int(fields[10])
+                if 'RSRP' in line:
+                    ssb_rsrp = int(fields[12])
+                found.add('syncref')
+                time_end_s = float(fields[0])
+
+            #153092.995494 [NR_PHY]   In nr_ue_sl_pssch_rsrp_measurements: [UE 0] adj_ue_index 0 PSSCH-RSRP: -63 dBm/RE (6685627)
+            if not line.startswith('[') and 'PSSCH-RSRP:' in line:
+                fields = line.split(maxsplit=11)
+                pssch_rsrp = int(fields[-3])
+
+            # 153090.331558 [PHY]   PSSCH test OK with 1 / 2 = 0.50
+            if not line.startswith('[') and 'PSSCH test' in line:
+                fields = line.split(maxsplit=10)
+                nb_decoded = int(fields[-5])
+                total_rx = int(fields[-3])
+
+            if time_start_s == -1 and 'nrUE configured' in line:
+                fields = line.split(maxsplit=3)
+                time_start_s = float(fields[0])
+
+            if sci2:
+                if 'the polar decoder output is:' in line:
+                    line = line.strip()
+                    user_msg = line
+                    found.add('sci2')
+            else:
+                if 'Received your text! It says:' in line:
+                    line = line.strip()
+                    user_msg = line
+                    found.add('found')
+
+        self.LOGGER.debug('found: %r', found)
+        if 'syncref' not in found:
+            self.LOGGER.error(f'Failed -- No SyncRef UE.')
+            return (result, user_msg)
+        if exp_nid1 != est_nid1 or exp_nid2 != est_nid2:
+            self.LOGGER.error(f'Failed -- found SyncRef UE Nid1 {est_nid1}, Ni2 {est_nid2}, expecting Nid1 {exp_nid1}, Nid2 {exp_nid2}')
+            return (result, user_msg)
+        if time_start_s == -1:
+            self.LOGGER.error(f'Failed -- No start time found! Fix log and re-run!')
+            return (result, user_msg)
+
+        delta_time_s = time_end_s - time_start_s
+        result = f'SyncRef UE found. PSSCH-RSRP: {pssch_rsrp} dBm/RE. SSS-RSRP: {ssb_rsrp} dBm/RE passed {nb_decoded} total {total_rx} It took {delta_time_s} seconds'
+        self.LOGGER.info(result)
+        if user_msg != None: 
+            self.LOGGER.info(user_msg)
+        return (result, user_msg)
+
+    def get_analysis_messages_syncref(self, filename: str) -> Generator[str, None, None]:
+        """
+        Finding all logs in the log file with X fields for log parsing optimization
+        """
+        self.LOGGER.info('Scanning %s', filename)
+        for line in self.get_lines(filename):
+            #796811.532881 [NR_PHY] nrUE configured
+            #796821.854505 [NR_PHY] PSBCH SL generation started
+            fields = line.split(maxsplit=5)
+            if len(fields) == 4 or len(fields) == 6 :
+                yield line
+
+    def analyze_syncref_logs(self, sync_duration: float, log_file: str) -> int:
+        """
+        Checking logs of SyncRef UE.
+        """
+        time_start_s, time_end_s = -1, -1
+        sum_ssb = 0
+
+        if self.OPTS.compress:
+            log_file = f'{log_file}.bz2'
+        for line in self.get_analysis_messages_syncref(log_file):
+            #796821.854505 [NR_PHY] PSBCH SL generation started
+            if time_start_s == -1 and 'PSBCH SL generation started' in line:
+                fields = line.split(maxsplit=2)
+                time_start_s = float(fields[0])
+                time_end_s = time_start_s + sync_duration
+            if 'PSBCH SL generation started' in line:
+                fields = line.split(maxsplit=2)
+                time_st = float(''.join([ch for ch in fields[0] if ch.isnumeric() or ch =='.']))
+                if time_st < time_end_s:
+                    sum_ssb += 1
+        return sum_ssb
--- a/ci-scripts/sl_net_config.json
+++ b/ci-scripts/sl_net_config.json
@@ -0,0 +1,107 @@
+{
+    "usrp": {
+        "net_0": [
+            {
+                "id": "",
+                "role": "syncref",
+                "ip": "",
+                "cmd": "sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 38 --SLC 2600000000 --ue-txgain 0 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "",
+                "ip": "10.1.1.61",
+                "cmd": "cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd \"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 38 --SLC 2600000000 --ue-rxgain 90 --usrp-args type=b200,serial=3150361,clock_source=external --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1\""
+            }
+        ],
+        "net_1": [
+            {
+                "role": "syncref",
+                "id": "",
+                "ip": "",
+                "cmd": "sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "",
+                "ip": "10.1.1.80",
+                "_comment": "atten value = 30, ue-rxgain = 80 for the cable conneciton",
+                "cmd": "cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd \"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1\""
+            }
+        ],
+        "net_2": [
+            {
+                "role": "syncref",
+                "id": "",
+                "ip": "",
+                "_comment": "atten value = 30, ue-rxgain = 80 for the cable conneciton",
+                "cmd": "sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "",
+                "ip": "10.1.1.63",
+                "_comment": "atten value = 30, ue-rxgain = 80 for the cable conneciton",
+                "cmd": "cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd \"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1\""
+            }
+        ],
+        "net_3": [
+            {
+                "role": "syncref",
+                "id": "1",
+                "ip": "",
+                "cmd": "sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 1 > ~/syncref1.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "2",
+                "ip": "10.1.1.80",
+                "_comment": "atten value = 30, ue-rxgain = 80 for the cable conneciton",
+                "cmd": "cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd \"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --ue-rxgain 80 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 2 > ~/nearby2.log 2>&1\""
+            },
+            {
+                "role": "nearby",
+                "id": "3",
+                "ip": "10.1.1.63",
+                "_comment": "atten value = 30, ue-rxgain = 80 for the cable conneciton",
+                "cmd": "cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd \"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor --node-number 3 > ~/nearby3.log 2>&1\""
+            }
+        ]
+    },
+    "rfsim": {
+        "net_1": [
+            {
+                "role": "syncref",
+                "id": "",
+                "ip": "",
+                "cmd": "sudo -E RFSIMULATOR=server $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sync-ref --rfsim --sl-mode 2 --rbsl 106 --SLC 3300000000 --ue-txgain 0 --rfsimulator.serverport 4048 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "",
+                "ip": "",
+                "cmd": "sudo -E RFSIMULATOR=127.0.0.1 $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim --sl-mode 2 --rbsl 106 --SLC 3300000000 --ue-rxgain 90 --rfsimulator.serverport 4048 --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1"
+            }
+        ],
+        "net_2": [
+            {
+                "role": "syncref",
+                "id": "1",
+                "ip": "",
+                "cmd": "sudo -E RFSIMULATOR=127.0.0.1 $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sync-ref --rfsim --sl-mode 2 --rbsl 52 --SLC 2600000000 --ue-txgain 0 --node-number 1 --rfsimulator.serverport 4048 --log_config.global_log_options time,nocolor > ~/syncref1.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "2",
+                "ip": "",
+                "cmd": "sudo -E RFSIMULATOR=server $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim --sl-mode 2 --rbsl 52 --SLC 2600000000 --ue-txgain 0 --ue-rxgain 90 --node-number 2 --rfsimulator.serverport 4048 --log_config.global_log_options time,nocolor > ~/nearby2.log 2>&1"
+            },
+            {
+                "role": "nearby",
+                "id": "3",
+                "ip": "",
+                "cmd": "sudo -E RFSIMULATOR=127.0.0.1 $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --rfsim --sl-mode 2 --rbsl 52 --SLC 2600000000 --ue-rxgain 90 --node-number 3 --rfsimulator.serverport 4048 --log_config.global_log_options time,nocolor > ~/nearby3.log 2>&1"
+            }
+        ]
+    }
+}
--- a/ci-scripts/sl_rx_agent.py
+++ b/ci-scripts/sl_rx_agent.py
@@ -0,0 +1,243 @@
+#!/usr/bin/env python3
+#
+# Automated tests for running 5G NR Sidelink Nearby UE.
+# The following is an example to run this script.
+#
+# python3 sl_rx_agent.py \
+# --cmd 'sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH \
+# $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+# --sl-mode 2 -r 52 --numerology 1 --band 38 -C 2600000000  --ue-rxgain 20 \
+# --usrp-args "type=n3xx,addr=192.168.20.2,subdev=A:0,master_clock_rate=122.88e6" \
+# > ~/rx.log 2>&1' \
+# --nid1 10 --nid2 1
+#
+# See `--help` for more information.
+#
+
+import os
+import sys
+import argparse
+import logging
+import time
+import glob
+import bz2
+import subprocess
+from subprocess import Popen
+from typing import Optional, List
+from sl_check_log import LogChecker
+
+HOME_DIR = os.path.expanduser( '~' )
+
+DEFAULT_RFSIM_CMD = 'sudo -E RFSIMULATOR=127.0.0.1 \
+               /local/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+               --rfsim --sl-mode 2 --rfsimulator.serverport 4048'
+
+DEFAULT_USRP_CMD = 'sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH \
+$HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+--sl-mode 2 --rbsl 52 --numerology 1 --band 38 --SLC 2600000000 --ue-rxgain 90 \
+--usrp-args "type=b200,serial=3150361" \
+--log_config.global_log_options time,nocolor \
+> ~/rx.log 2>&1'
+
+# ----------------------------------------------------------------------------
+# Command line argument parsing
+
+parser = argparse.ArgumentParser(description="""
+Automated tests for 5G NR Sidelink Rx simulations
+""")
+
+parser.add_argument('--compress', '-c', action='store_true', help="""
+Compress the log files in the --log-dir
+""")
+
+parser.add_argument('--cmd', type=str, default=DEFAULT_USRP_CMD, help="""
+Commands
+""")
+
+parser.add_argument('--debug', action='store_true', help="""
+Enable debug logging (for this script only)
+""")
+
+parser.add_argument('--duration', '-d', metavar='SECONDS', type=int, default=20, help="""
+How long to run the test before stopping to examine the logs
+""")
+
+parser.add_argument('--log-dir', default=HOME_DIR, help="""
+Where to store log files
+""")
+
+parser.add_argument('--nid1', type=int, default=10, help="""
+Nid1 value
+""")
+
+parser.add_argument('--nid2', type=int, default=1, help="""
+Nid2 value
+""")
+
+parser.add_argument('--no-run', '-n', action='store_true', help="""
+Don't run the test, only examine the logs in the --log-dir
+directory from a previous run of the test
+""")
+
+parser.add_argument('--sci2', action='store_true', help="""
+Enable SCI2 log parsing (this will grep the logs for the SCI2 payload)
+""")
+
+OPTS = parser.parse_args()
+del parser
+
+logging.basicConfig(level=logging.DEBUG if OPTS.debug else logging.INFO,
+                    format='>>> %(name)s: %(levelname)s: %(message)s')
+LOGGER = logging.getLogger(os.path.basename(sys.argv[0]))
+
+# ----------------------------------------------------------------------------
+
+def compress(from_name: str, to_name: Optional[str]=None, remove_original: bool=False) -> None:
+    """
+    Compress the file `from_name` and store it as `to_name`.
+    `to_name` defaults to `from_name` with `.bz2` appended.
+    If `remove_original` is True, removes `from_name` when the compress finishes.
+    """
+    if to_name is None:
+        to_name = from_name
+    if not to_name.endswith('.bz2'):
+        to_name += '.bz2'
+    LOGGER.info('Compress %s to %s', from_name, to_name)
+    with bz2.open(to_name, 'w') as outh, \
+        open(from_name, 'rb') as inh:
+        while True:
+            data = inh.read(10240)
+            if not data:
+                break
+            outh.write(data)
+    if remove_original:
+        LOGGER.debug('Remove %s', from_name)
+        os.remove(from_name)
+
+
+class CompressJobs:
+    """
+    Allow multiple invocations of `compress` to run in parallel
+    """
+
+    def __init__(self) -> None:
+        self.kids: List[int] = []
+
+    def compress(self, from_name: str, to_name: Optional[str]=None, remove_original: bool=False) -> None:
+        if not os.path.exists(from_name):
+            # It's not necessarily an error if the log file does not exist.
+            # For example, if nfapi_trace never gets invoked (e.g., because
+            # NFAPI_TRACE_LEVEL is set to none), then the log file nfapi.log
+            # will not get created.
+            LOGGER.warning('No file: %s', from_name)
+            return
+        kid = os.fork()
+        if kid != 0:
+            self.kids.append(kid)
+        else:
+            LOGGER.debug('in pid %d compress %s...', os.getpid(), from_name)
+            compress(from_name, to_name, remove_original)
+            LOGGER.debug('in pid %d compress %s...done', os.getpid(), from_name)
+            sys.exit()
+
+    def wait(self) -> None:
+        LOGGER.debug('wait %s...', self.kids)
+        failed = []
+        for kid in self.kids:
+            LOGGER.debug('waitpid %d', kid)
+            _pid, status = os.waitpid(kid, 0)
+            if status != 0:
+                failed.append(kid)
+        if failed:
+            raise Exception('compression failed: %s', failed)
+        LOGGER.debug('wait...done')
+
+
+class TestNearby():
+    """
+    Represents TestNearby
+    """
+    def __init__(self, cmd: str):
+        self.cmd = cmd
+        self.delay = 0 # seconds
+        self.id = self._get_id()
+        self.role = "nearby"
+        self.log_file_path = os.path.join(OPTS.log_dir, f'{self.role}{self.id}.log')
+
+    def __str__(self) -> str:
+        return f'{self.role}{self.id}'
+
+    def _get_id(self) -> str:
+        node_id = ''
+        if 'node-number' in self.cmd:
+            node_id = self.cmd.split('node-number')[-1].split()[0]
+        return node_id
+
+    def run(self) -> bool:
+        time.sleep(self.delay)
+        proc = self.launch_nearby()
+        LOGGER.info(f"nearby_proc = {proc}")
+        LOGGER.info(f"Process running... {self}")
+        time.sleep(OPTS.duration)
+        passed = self.kill_process(proc)
+        if OPTS.compress:
+            self.compress_log_file(proc)
+        return passed
+
+    def launch_nearby(self) -> Popen:
+        LOGGER.info('Launching Nearby UE')
+        proc = Popen(self.cmd, shell=True)
+        time.sleep(1)
+        return proc
+
+    def kill_process(self, proc: Popen) -> bool:
+        passed = True
+        if proc:
+            status = proc.poll()
+            if status is None:
+                LOGGER.info('process is still running, which is good')
+            else:
+                passed = False
+                LOGGER.info('process ended early: %r', status)
+                LOGGER.info(f'{self} process ended early: {status}')
+        if proc and passed:
+            LOGGER.info(f'kill main simulation processes... {self}')
+            cmd = ['sudo', 'killall']
+            cmd.append('-KILL')
+            cmd.append('nr-uesoftmodem')
+            if "nearby" == self.role:
+                subprocess.run(cmd)
+            LOGGER.info(f'Waiting for PID proc.pid for {self}')
+            proc.kill()
+            proc.wait()
+        LOGGER.info(f'kill main simulation processes...done for {self}')
+        return passed
+
+    def compress_log_file(self, proc: Popen):
+        jobs = CompressJobs()
+        jobs.compress(self.log_file_path)
+        jobs.wait()
+
+# ----------------------------------------------------------------------------
+
+def main(argv) -> int:
+    test_agent = TestNearby(OPTS.cmd)
+    log_agent = LogChecker(OPTS, LOGGER)
+
+    passed = True
+    if not OPTS.no_run:
+        passed = test_agent.run()
+
+    # Examine the logs to determine if the test passed
+    result, user_msg = log_agent.analyze_nearby_logs(OPTS.nid1, OPTS.nid2, OPTS.sci2, test_agent.log_file_path)
+    if not result or not user_msg:
+        passed = False
+
+    if not passed:
+        LOGGER.critical("FAILED - Didn't get your text, sorry. Please try again!")
+        return 1
+
+    LOGGER.info("PASSED - I got your text! Thanks!")
+    return 0
+
+sys.exit(main(sys.argv))
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -1,6 +1,8 @@
  - Build_Proxy
+  - Build_Cluster_Image
  - Build_PhySim
-  - Run_PhySim
+  - Run_LDPCTest
+  - Run_NRulsimTest
  - Build_eNB
  - WaitEndBuild_eNB
  - Initialize_eNB
--- a/ci-scripts/xml_files/benetel_nsa_quectel.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
 	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>3</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030000
 040000
--- a/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
+++ b/ci-scripts/xml_files/benetel_nsa_quectel_longrun.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>TEST-NSA-FR1-TM1</htmlTabRef>
 	<htmlTabName>NSA Ping DL UL with QUECTEL</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>3</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030000
 040000
--- a/ci-scripts/xml_files/cluster_image_build.xml
+++ b/ci-scripts/xml_files/cluster_image_build.xml
@@ -0,0 +1,35 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+-->
+
+<testCaseList>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build Images on Cluster</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>000001</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>Build_Cluster_Image</class>
+		<desc>Build Images on OpenShift Cluster</desc>
+	</testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -21,7 +21,7 @@

 -->
 <testCaseList>
-        <htmlTabRef>l2sim-5gnr-proxy-build</htmlTabRef>
+        <htmlTabRef>l2sim-4glte-proxy-build</htmlTabRef>
        <htmlTabName>Build L2sim proxy image</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
@@ -36,7 +36,7 @@
                <eNB_instance>1</eNB_instance>
                <eNB_serverId>1</eNB_serverId>
                <forced_workspace_cleanup>True</forced_workspace_cleanup>
-                <proxy_commit>56cfdc0</proxy_commit>
+                <proxy_commit>ce3562b</proxy_commit>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -0,0 +1,135 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-tdd</htmlTabRef>
+        <htmlTabName>Testing 4G LTE L2 sim - FDD eNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 100001
+ 000000
+ 000001
+ 000002
+ 000003
+ 000011
+ 200000
+ 020001
+ 020002
+ 030011
+ 030012
+ 200001
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy Cassandra Database</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>cassandra db_init</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000001">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 4G CoreNetwork</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>oai_hss redis magma_mme oai_spgwc oai_spgwu trf_gen</services>
+                <nb_healthy>7</nb_healthy>
+        </testCase>
+
+        <testCase id="000002">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 4G eNB L2 sim</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>oai_enb</services>
+                <nb_healthy>8</nb_healthy>
+        </testCase>
+
+        <testCase id="000003">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI L2 sim 4G LTE-UE 1 and Proxy</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+                <services>proxy oai_ue1</services>
+                <nb_healthy>10</nb_healthy>
+        </testCase>
+
+        <testCase id="000011">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
+
+        <testCase id="020001">
+                <class>PingFromContainer</class>
+                <desc>Ping trf-gen from LTE-UE 1</desc>
+                <container_name>l2sim4g-oai-lte-ue1</container_name>
+                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>PingFromContainer</class>
+                <desc>Ping LTE-UE 1 from trf-gen</desc>
+                <container_name>l2sim4g-trf-gen</container_name>
+                <options>-c 20 12.0.0.2</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="030011">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>l2sim4g-oai-lte-ue1</server_container_name>
+                <client_container_name>l2sim4g-trf-gen</client_container_name>
+                <server_options>-B 12.0.0.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.0.0.2 -u -i 1 -t 30 -b 1M</client_options>
+        </testCase>
+
+        <testCase id="030012">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>l2sim4g-trf-gen</server_container_name>
+                <client_container_name>l2sim4g-oai-lte-ue1</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.0.0.2 -c 192.168.61.11 -u -i 1 -t 30 -b 3M</client_options>
+        </testCase>
+
+        <testCase id="100001">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 4G stack</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+        <testCase id="200000">
+                <class>StatsFromGenObject</class>
+                <desc>Statistics before Traffic Test</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+        <testCase id="200001">
+                <class>StatsFromGenObject</class>
+                <desc>Statistics after Traffic Test</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd_down.xml
@@ -0,0 +1,38 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-down</htmlTabRef>
+        <htmlTabName>CleanUp 4G L2 sim - FDD eNB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100002
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100002">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 4G stack</desc>
+                <yaml_path>yaml_files/4g_l2sim_fdd</yaml_path>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -24,7 +24,7 @@
        <htmlTabRef>rfsim-4glte-tdd05mhz</htmlTabRef>
        <htmlTabName>Monolithic eNB - TDD 05MHz</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
-		<repeatCount>2</repeatCount>
+		<repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 100011
 000011
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-f1</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim in containers - CU-DU F1 split</htmlTabName>
+        <htmlTabName>CU-DU F1 split</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
 100021
--- a/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down-f1</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - CU-DU F1 split</htmlTabName>
+        <htmlTabName>CleanUp CU-DU F1 split</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100022
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -22,9 +22,9 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-fdd</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim - Monolithic FDD gNB</htmlTabName>
+        <htmlTabName>Monolithic FDD gNB with SDAP</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>4</repeatCount>
+        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 100011
 000010
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-fdd-down</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - Monolithic FDD gNB</htmlTabName>
+        <htmlTabName>CleanUp Monolithic FDD gNB with SDAP</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100012
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -24,7 +24,7 @@
        <htmlTabRef>l2sim-5gnr-tdd</htmlTabRef>
        <htmlTabName>Testing 5G NR L2 sim - TDD gNB</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>2</repeatCount>
+        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 100001
 000000
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -22,9 +22,9 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Testing 5G NR RF sim - Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>Monolithic TDD gNB</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
-        <repeatCount>4</repeatCount>
+        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
 100001
 000000
--- a/ci-scripts/xml_files/container_5g_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp 5G RF - Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>CleanUp Monolithic TDD gNB</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -0,0 +1,42 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
+        <htmlTabName>Build L2sim proxy image</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 000001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="000001">
+                <class>Build_Proxy</class>
+                <desc>Build L2sim Proxy Image</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+                <forced_workspace_cleanup>True</forced_workspace_cleanup>
+                <proxy_commit>ce3562b</proxy_commit>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ocp_usrp210_band7_test_05mhz_tm1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201
 040101
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201 090109
 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_fembms_no_s1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-fembms-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-FEMBMS-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201 090109
 030104 000001 090104 000002 040605 000001 090109 030201
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_mbms_no_s1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-mbms-nos1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-MBMS-TM1-noS1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201 090109
 030103 000001 090103 000002 040605 000001 090109 030201
--- a/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
+++ b/ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1_s1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-tunnel</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-tunnel</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201 090109
 030102 000001 090102 000002 040503 000001 040603 040604 040643 040644 000001 090109 030201
--- a/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
@@ -25,7 +25,7 @@
 	<htmlTabRef>test-05-tm2</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM2</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040608</TestMinId>
        <TestCaseRequestedList>
--- a/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-20-tm1</htmlTabRef>
 	<htmlTabName>Test-20MHz-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040623</TestMinId>
 	<TestCaseRequestedList>
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-rrc-no-flex</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201
 040101
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_w_flexran.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-05-tm1-rrc-w-flex</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM1-RRC-Inactivity-FlexRan</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201
 040101
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
@@ -111,16 +111,16 @@

 	<testCase id="040651">
 		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(balanced profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(balanced profile)</desc>
+		<iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>balanced</iperf_profile>
 	</testCase>

 	<testCase id="040652">
 		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
+		<desc>iperf (10MHz - UL/18Mbps/UDP)(30 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 18M -t 30 -i 1 -R</iperf_args>
 		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
 		<iperf_profile>single-ue</iperf_profile>
 	</testCase>
--- a/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml
@@ -24,7 +24,7 @@
 	<htmlTabRef>test-10-cdrx-tm1</htmlTabRef>
 	<htmlTabName>Test-10MHz-CDRX-TM1</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 030201
 040101
--- a/ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.xml
+++ b/ci-scripts/xml_files/f1_usrp210_band7_test_05mhz.xml
@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>test-f1-05</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-05MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030142 030141 000002 040301 000002 040541 040601 040641 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030141">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.25PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030142">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.25PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040541">
-		<class>Ping</class>
-		<desc>ping (5MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040601">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - DL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040641">
-		<class>Iperf</class>
-		<desc>iperf (5MHz - UL/9Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 9M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.xml
+++ b/ci-scripts/xml_files/f1_usrp210_band7_test_10mhz.xml
@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>test-f1-10</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-10MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030152 030151 000002 040301 000002 040551 040611 040651 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030151">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030152">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/10MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.50PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040551">
-		<class>Ping</class>
-		<desc>ping (10MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040611">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - DL/32Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 32M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040651">
-		<class>Iperf</class>
-		<desc>iperf (10MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.xml
+++ b/ci-scripts/xml_files/f1_usrp210_band7_test_20mhz.xml
@@ -1,111 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-	<htmlTabRef>test-f1-20</htmlTabRef>
-	<htmlTabName>Test-F1-CU-DU-20MHz</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>4</repeatCount>
-	<TestCaseRequestedList>
- 030201
- 040101
- 030162 030161 000002 040301 000002 040561 040621 040661 040401 040201 030201 030202
-	</TestCaseRequestedList>
-	<TestCaseExclusionList>
-	</TestCaseExclusionList>
-
-	<testCase id="000002">
-		<class>IdleSleep</class>
-		<desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-	</testCase>
-
-	<testCase id="030161">
-		<class>Initialize_eNB</class>
-		<desc>Initialize DU (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="030162">
-		<class>Initialize_eNB</class>
-		<desc>Initialize CU (FDD/Band7/20MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/cu.band7.tm1.100PRB.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030201">
-		<class>Terminate_eNB</class>
-		<desc>Terminate CU</desc>
-		<eNB_instance>0</eNB_instance>
-	</testCase>
-
-	<testCase id="030202">
-		<class>Terminate_eNB</class>
-		<desc>Terminate DU</desc>
-		<eNB_instance>1</eNB_instance>
-	</testCase>
-
-	<testCase id="040101">
-		<class>Initialize_UE</class>
-		<desc>Initialize UE</desc>
-	</testCase>
-
-	<testCase id="040201">
-		<class>Terminate_UE</class>
-		<desc>Terminate UE</desc>
-	</testCase>
-
-	<testCase id="040301">
-		<class>Attach_UE</class>
-		<desc>Attach UE</desc>
-	</testCase>
-
-	<testCase id="040401">
-		<class>Detach_UE</class>
-		<desc>Detach UE</desc>
-	</testCase>
-
-	<testCase id="040561">
-		<class>Ping</class>
-		<desc>ping (20MHz - 20 sec)</desc>
-		<ping_args>-c 20</ping_args>
-		<ping_packetloss_threshold>5</ping_packetloss_threshold>
-	</testCase>
-
-	<testCase id="040621">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - DL/70Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 30 -i 1</iperf_args>
-		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-	<testCase id="040661">
-		<class>Iperf</class>
-		<desc>iperf (20MHz - UL/15Mbps/UDP)(30 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 15M -t 30 -i 1 -R</iperf_args>
-		<iperf_packetloss_threshold>60</iperf_packetloss_threshold>
-		<iperf_profile>single-ue</iperf_profile>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
@@ -24,7 +24,7 @@
        <htmlTabRef>run-oai-gnb-nr-ue</htmlTabRef>
        <htmlTabName>Run-gNB-and-NR-UE</htmlTabName>
        <htmlTabIcon>tasks</htmlTabIcon>	
-	<repeatCount>2</repeatCount>
+	<repeatCount>1</repeatCount>
 	<TestCaseRequestedList>
 090101 000001 090102 000002 090108 090109
 	</TestCaseRequestedList>
@@ -52,7 +52,7 @@
        <testCase id="090102">
                <class>Initialize_OAI_UE</class>
                <desc>Initialize NR UE USRP</desc>
-		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --dlsch-parallel 4 --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
+		<Initialize_OAI_UE_args>--phy-test --usrp-args "addr=192.168.30.2,second_addr=192.168.50.2,clock_source=external,time_source=external" --ue-rxgain 50  --rrc_config_path . --log_config.global_log_options level,nocolor,time</Initialize_OAI_UE_args>
 		<air_interface>NR</air_interface>
        </testCase>

--- a/Show More
+++ b/Show More