Filling Xn structures- from CU configuration

Adding Config file

Review comments-changes

Config file changes

Parameter XN Enable related changes

Added XNAP section in config file

.gitignore

@@ -25,4 +25,3 @@ tags
 nfapi_nr_interface_scf
 *.log
 *.out
-CMakeUserPresets.json

CHANGELOG.md

@@ -1,61 +1,5 @@
 # RELEASE NOTES: #
 
-## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##
-
-General 5G improvements (both gNB and UE):
-- Make standalone mode (SA) the default (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Experimental support for FR2 operation
-- Support for GEO NTN and simulation of GEO satellite channel in RFsimulator
-  (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Support 2-step RA
-- Add optional LTTng logger in logging module (see
-  [`lttng_logs.md`](common/utils/LOG/DOC/lttng_logs.md))
-- Support for YAML-based config files (alongside libconfig) (see
-  [`gnb.sa.band78.106prb.rfsim.yaml`](ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml) and
-  [`nrue.uicc.yaml`](ci-scripts/conf_files/nrue.uicc.yaml))
-- Add new L1 scope based on Dear ImGui (see [`readme.md`](openair1/PHY/TOOLS/readme.md))
-- Allow cross-compilation on ARM (via SIMDE SIMD emulation library)
-- Allow to build and run with clang
-- Support/check for Linux capabilities, allow to run without sudo (see
-  [`tuning_and_security.md`](doc/tuning_and_security.md))
-- OAI does not modify CPU frequency and networking stack
-  ([`tuning_and_security.md`](doc/tuning_and_security.md))
-- Bugfixes in the entire stack (e.g.  #547, #663, #674, #687, #712, #736, #739,
-  #741, #756, #762, #773, ...)
-
-5G gNB:
-- Support for FR2 interoperability with COTS UE (no beam switching supported yet)
-- Add 4-layer DL MIMO (experimental)
-- Add gNB Neighbour configuration and Mobility over F1 interface (see
-  [`handover-tutorial.md`](doc/handover-tutorial.md))
-- Enhance O-RAN FHI 7.2: (see [`ORAN_FHI7.2_Tutorial.md`](doc/ORAN_FHI7.2_Tutorial.md))
-  * Support different bandwidths (40/60/80/100MHz) and antenna configs (1x1 up
-    to 4x4) for Benetel/VVDN/LITEON RUs
-  * Add support for multi-RU support (single-cell/distributed antenna)
-- Support AMD T2 Telco card look-aside L1 accelerator (see
-  [`LDPC_T2_OFFLOAD_SETUP.md`](doc/LDPC_T2_OFFLOAD_SETUP.md))
-- Support Nvidia Aerial/ARC in-line L1 accelerator (see
-  [`Aerial_FAPI_Split_Tutorial.md`](doc/Aerial_FAPI_Split_Tutorial.md))
-- Various fixes for multi-UE operation: by default support of up to 16 UEs concurrently
-- Documentation for
-  - 5G MAC (see [`mac-usage.md`](doc/MAC/mac-usage.md))
-  - 5G RRC (see [`rrc-usage.md`](doc/RRC/rrc-usage.md))
-  - E1 (see [`E1-design.md`](doc/E1AP/E1-design.md))
-  - F1 (see [`F1-design.md`](doc/F1AP/F1-design.md))
-
-5G UE:
-- Basic interoperability with COTS gNB (Nokia gNB)
-- Implement PHR reporting
-- Implement RRC re-establishment
-- Implement PUCCH/PUSCH/SRS power control
-- Implement UCI on PUSCH and aperiodic CSI reporting
-- Support of cell search (within the selected UE bandwidth) (see [`RUNMODEM.md`](doc/RUNMODEM.md))
-- Enhance connection control: implement timers, resync
-- A lot of internal cleanup
-
-This release also includes many fixes and documentation updates. See
-`doc/README.md` in the repository for an overview of documentation.
-
 ## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
 
 This release improves existing 5G support and adds various new features.

CMakeLists.txt

@@ -32,7 +32,7 @@ set (OPENAIR_DIR     ${CMAKE_SOURCE_DIR})
 
 include("cmake_targets/macros.cmake")
 if(NOT DEFINED ENV{CPM_SOURCE_CACHE})
-  set(CPM_SOURCE_CACHE ~/.cache/cpm/ CACHE FILEPATH "Directory to download CPM dependencies")
+ set(CPM_SOURCE_CACHE ~/.cache/cpm/)
 endif()
 include("cmake_targets/CPM.cmake")
 
@@ -43,7 +43,7 @@ include("cmake_targets/CPM.cmake")
 option(CCACHE_ACTIVE "CCache" ON)
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND AND CCACHE_ACTIVE)
-  if(${CMAKE_VERSION} VERSION_LESS "3.4.0")
+  if(${CMAKE_VERSION} VERSION_LESS "3.4.0") 
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
     message(STATUS "Found ccache in ${CCACHE_FOUND}. Using ccache. CMake < 3.4")
   else()
@@ -105,13 +105,13 @@ add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of bui
 
 # in case /proc/cpuinfo exists we want to inspect available Intrinsics
 # -so not to go always through SIMDE emulation
-# -so to avoid AVX512 instructions generation by gcc
+# -so to avoid AVX512 instructions generation by gcc   
 if(EXISTS "/proc/cpuinfo" AND NOT CROSS_COMPILE)
   file(STRINGS "/proc/cpuinfo" CPUFLAGS REGEX flags LIMIT_COUNT 1)
 else()
   message(WARNING "did not find /proc/cpuinfo -- not setting any x86-specific compilation variables")
 endif()
-
+ 
 eval_boolean(AUTODETECT_AVX512 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx512")
 add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is available on the host processor" ON)
 
@@ -175,9 +175,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
 endif()
 
 set(CMAKE_C_FLAGS
-  "${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops ${CMAKE_C_FLAGS}")
+  "${CMAKE_C_FLAGS} ${C_FLAGS_PROCESSOR} ${commonOpts} -std=gnu11 -funroll-loops")
 set(CMAKE_CXX_FLAGS
-  "${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11 ${CMAKE_CXX_FLAGS}")
+  "${CMAKE_CXX_FLAGS} ${C_FLAGS_PROCESSOR}  ${commonOpts} -std=c++11")
 
 
 add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)" ON)
@@ -271,11 +271,6 @@ add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
 
-add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)
-if (TRACY_ENABLE)
-  CPMAddPackage("gh:wolfpld/tracy#v0.11.1")
-endif()
-
 set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
 add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
 target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -298,7 +293,7 @@ set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
 message(STATUS "Selected KPM Version: ${KPM_VERSION}")
 
 
-add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
+add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" ON)
 
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
@@ -440,18 +435,20 @@ add_library(f1ap
             ${F1AP_DIR}/f1ap_cu_rrc_message_transfer.c
             ${F1AP_DIR}/f1ap_cu_task.c
             ${F1AP_DIR}/f1ap_cu_ue_context_management.c
+            ${F1AP_DIR}/f1ap_cu_warning_message_transmission.c
             ${F1AP_DIR}/f1ap_du_interface_management.c
             ${F1AP_DIR}/f1ap_du_paging.c
             ${F1AP_DIR}/f1ap_du_rrc_message_transfer.c
+            ${F1AP_DIR}/f1ap_du_system_information.c
             ${F1AP_DIR}/f1ap_du_task.c
             ${F1AP_DIR}/f1ap_du_ue_context_management.c
+            ${F1AP_DIR}/f1ap_du_warning_message_transmission.c
             ${F1AP_DIR}/f1ap_encoder.c
             ${F1AP_DIR}/f1ap_handlers.c
             ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap L2_NR)
-target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
-target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)
 
 # LPP
 ##############
@@ -641,8 +638,7 @@ if (cap_FOUND)
   target_link_libraries(UTIL PRIVATE cap)
   target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)
 endif()
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils barrier actor)
-target_link_libraries(UTIL PUBLIC instrumentation)
+target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)
 
 set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -683,7 +679,7 @@ set(SCHED_NR_SRC
   ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
 )
 add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
-target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_RU
   ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -701,7 +697,7 @@ set(SCHED_SRC_UE
   ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c
 )
 add_library(SCHED_UE_LIB ${SCHED_SRC_UE})
-target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 set(SCHED_SRC_NR_UE
   ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -712,7 +708,7 @@ set(SCHED_SRC_NR_UE
   ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c
 )
 add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})
-target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 # nFAPI
 #################################
@@ -723,7 +719,7 @@ set(NFAPI_SRC
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
+target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)
 
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -748,7 +744,7 @@ set(NFAPI_VNF_SRC
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
 target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)
+target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)
 if(OAI_AERIAL)
   target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
 endif()
@@ -764,8 +760,7 @@ set(NFAPI_USER_SRC
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
-target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
+target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
@@ -779,7 +774,7 @@ set(PHY_TURBOSRC
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c
 )
 set(PHY_POLARSRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
@@ -1008,7 +1003,7 @@ set(PHY_SRC_UE
 
   set(PHY_NR_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
-  ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_csi_rs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/scrambling_luts.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
@@ -1040,12 +1035,12 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_csi_rs.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_freq_equalization.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
+  #${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
   ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c
@@ -1100,6 +1095,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
+ # ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
   ${OPENAIR1_DIR}/PHY/TOOLS/log2_approx.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cmult_sv.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cmult_vv.c
@@ -1110,6 +1106,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
   ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
+  #  ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_NR_CODINGIF}
@@ -1125,7 +1122,7 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
 target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
 add_dependencies(PHY_COMMON dfts)
-target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs PUBLIC UTIL)
+target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
 
 add_library(PHY ${PHY_SRC})
 target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1134,7 +1131,7 @@ pkg_check_modules(blas REQUIRED blas)
 pkg_check_modules(lapacke REQUIRED lapacke)
 
 add_library(PHY_UE ${PHY_SRC_UE})
-target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
+target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 # RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will
 # be empty for Ubuntu, a no-op
 pkg_check_modules(cblas cblas)
@@ -1142,7 +1139,6 @@ target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapa
 target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})
 
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
-target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common)
@@ -1152,10 +1148,10 @@ target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
 
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
 
 add_library(PHY_RU ${PHY_SRC_RU})
-target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
+target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
 
 #Library for mex functions
 #########################3
@@ -1224,7 +1220,7 @@ set(NR_SDAP_SRC
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
   )
-
+  
 set(L2_SRC
   ${PDCP_DIR}/pdcp.c
   ${PDCP_DIR}/pdcp_fifo.c
@@ -1268,6 +1264,7 @@ set(L2_NR_SRC
   ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_RRC_DIR}/rrc_gNB.c
+  ${NR_RRC_DIR}/nr_rrc_common.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
   ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
   ${NR_RRC_DIR}/nr_rrc_config.c
@@ -1279,7 +1276,6 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB_radio_bearers.c
   ${NR_RRC_DIR}/rrc_gNB_cuup.c
   ${NR_RRC_DIR}/rrc_gNB_du.c
-  ${NR_RRC_DIR}/rrc_gNB_mobility.c
   )
 
 set(L2_SRC_UE
@@ -1382,6 +1378,7 @@ set (MAC_NR_SRC_UE
   ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
+  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
 )
 
 set (ENB_APP_SRC
@@ -1430,7 +1427,7 @@ endif()
 
 
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures)
 
 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1441,8 +1438,6 @@ add_library(L2_NR
   ${GNB_APP_SRC}
   )
 target_link_libraries(L2_NR PRIVATE ds alg)
-target_link_libraries(L2_NR PRIVATE f1ap_lib)
-target_include_directories(L2_NR PRIVATE ${F1AP_DIR}/lib)
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1451,7 +1446,7 @@ add_library(e1_if
 
 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)
 
-target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common xnap)
 if(OAI_AERIAL)
     target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
@@ -1485,7 +1480,7 @@ target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)
 
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 target_link_libraries(NR_L2_UE PRIVATE f1ap nr_rlc)
-target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures nr_ue_ra_procedures)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures)
 
 add_library(MAC_NR_COMMON
             ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1569,10 +1564,6 @@ set(libnas_emm_msg_OBJS
   ${NAS_SRC}COMMON/EMM/MSG/UplinkNasTransport.c
 )
 
-set(libnas_fgs_msg_OBJS
-  ${NAS_SRC}COMMON/EMM/MSG/fgs_service_request.c
-)
-
 set(libnas_esm_msg_OBJS
   ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.c
   ${NAS_SRC}COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.c
@@ -1686,6 +1677,7 @@ set (libnas_utils_OBJS
   ${NAS_SRC}COMMON/UTIL/nas_timer.c
   ${NAS_SRC}COMMON/UTIL/socket.c
   ${NAS_SRC}COMMON/UTIL/stty.c
+  ${NAS_SRC}COMMON/UTIL/TLVEncoder.c
   ${NAS_SRC}COMMON/UTIL/TLVDecoder.c
   ${NAS_SRC}COMMON/UTIL/OctetString.c
 )
@@ -1792,11 +1784,10 @@ add_library(LIB_NAS_SIMUE
   ${NAS_SRC}UE/nas_parser.c
   ${NAS_SRC}UE/nas_proc.c
   ${NAS_SRC}UE/nas_user.c
-  ${NAS_SRC}NR_UE/nr_nas_msg.c
+  ${NAS_SRC}NR_UE/nr_nas_msg_sim.c
   ${libnas_api_OBJS}
   ${libnas_ue_api_OBJS}
   ${libnas_emm_msg_OBJS}
-  ${libnas_fgs_msg_OBJS}
   ${libnas_esm_msg_OBJS}
   ${libnas_ies_OBJS}
   ${libnas_utils_OBJS}
@@ -1843,7 +1834,6 @@ include_directories(${NAS_SRC}UE)
 include_directories(${NAS_SRC}UE/API/USER)
 include_directories(${NAS_SRC}UE/API/USIM)
 include_directories(${NAS_SRC}UE/EMM)
-include_directories(${NAS_SRC}UE/EMM/MSG)
 include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)
@@ -1857,6 +1847,8 @@ add_library(NB_IoT MODULE ${NBIOT_SOURCES} )
 
 add_library(LIB_5GNAS_GNB
   ${NAS_SRC}/COMMON/nr_common.c
+  ${NAS_SRC}/gNB/network_process_nas.c
+  ${NAS_SRC}/NR_UE/ue_process_nas.c
   ${OPENAIR3_DIR}//UICC/usim_interface.c
   )
 
@@ -1910,6 +1902,12 @@ add_executable(measurement_display
   ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)
 
+add_executable(test5Gnas
+  ${OPENAIR_DIR}/openair3/TEST/test5Gnas.c
+)
+target_link_libraries (test5Gnas LIB_5GNAS_GNB minimal_lib )
+
+
 # lte-softmodem is both eNB and UE implementation
 ###################################################
 
@@ -2071,7 +2069,7 @@ if(E2_AGENT)
   target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
   target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
-
+                     
 # nr-uesoftmodem is  UE implementation
 #######################################
 

CMakePresets.json

@@ -1,64 +0,0 @@
-{
-    "version": 3,
-    "configurePresets": [
-        {
-            "name": "default",
-            "displayName": "Default Config",
-            "description": "Default build using Ninja generator",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        },
-        {
-            "name": "tests",
-            "displayName": "Default unit test config",
-            "inherits": "default",
-            "binaryDir": "${sourceDir}/cmake_targets/ran_build/build_test",
-            "cacheVariables": {
-                "ENABLE_TESTS": "ON",
-                "SANITIZE_ADDRESS": "ON",
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-            }
-        }
-    ],
-    "buildPresets": [
-        {
-            "name": "5gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "nr-uesoftmodem",
-                "nr-softmodem",
-                "rfsimulator",
-                "dfts",
-                "ldpc",
-                "params_libconfig",
-                "params_yaml"
-            ]
-        },
-        {
-            "name": "default",
-            "inherits": "5gdefault"
-        },
-        {
-            "name": "4gdefault",
-            "configurePreset": "default",
-            "targets": [
-                "lte-softmodem",
-                "lte-uesoftmodem",
-                "dfts",
-                "coding",
-                "rfsimulator",
-                "params_libconfig"
-            ]
-        },
-        {
-            "name": "tests",
-            "configurePreset": "tests",
-            "targets": [
-                "tests"
-            ]
-        }
-    ]
-}

README.md

@@ -7,8 +7,9 @@
     <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
     <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
+    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 41"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore40-Green" alt="Supported OS Fedora 40"></a>
 </p>
 
 <p align="center">
@@ -75,8 +76,7 @@ openairinterface5g
 ├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
 ├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
-├── targets           : Some configuration files; only historical relevance, and might be deleted in the future
-└── tools             : Tools for use by the developers/ci machines: code analysis and formatting
+└── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
 
 # How to get support from the OAI Community # 

charts/physims/charts/nr-pbchsim.scs/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-name: oai-nr-pbchsim-scs
-description: A Helm subchart for nr-pbchsim network function ("Other SCS" tests)
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: v1
-
-keywords:
-  - Physical Simulator
-  - nr-pbchsim
-  - RAN
-  - 5G
-
-sources:
-  - https://gitlab.eurecom.fr/oai/openairinterface5g
-
-maintainers:
-  - name:  OPENAIRINTERFACE
-    email: contact@openairinterface.org

charts/physims/charts/nr-pbchsim.scs/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "oai-nr-pbchsim-scs.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "oai-nr-pbchsim-scs.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "oai-nr-pbchsim-scs.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.labels" -}}
-helm.sh/chart: {{ include "oai-nr-pbchsim-scs.chart" . }}
-{{ include "oai-nr-pbchsim-scs.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "oai-nr-pbchsim-scs.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "oai-nr-pbchsim-scs.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "oai-nr-pbchsim-scs.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "oai-nr-pbchsim-scs.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/physims/charts/nr-pbchsim.scs/templates/job.yaml

@@ -1,42 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Chart.Name }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: physim
-    spec:
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-    {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      containers:
-      - name: physim
-        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-        env:
-        - name: OPENAIR_DIR
-          value: /opt/oai-physim
-        command: ["/bin/sh", "-c"]
-        args:
-        - >
-          cmake_targets/autotests/run_exec_autotests.bash -g "nr_pbchsim.otherSCS" -d bin/ &&
-          echo "FINISHED" && sleep infinity
-      dnsPolicy: ClusterFirst
-      restartPolicy: Never
-      schedulerName: default-scheduler
-      serviceAccountName: {{ .Values.global.serviceAccountName }}
-      terminationGracePeriodSeconds: 30
-      {{- if .Values.global.nodeSelector}}
-      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
-      {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
-      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
-      {{- end }}

charts/physims/charts/nr-pbchsim.scs/values.yaml

@@ -1,48 +0,0 @@
-# Default values for oai-nr-pbchsim-scs
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  # pullPolicy: IfNotPresent or Never or Always
-  pullPolicy: Always
-
-imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: "oai-nr-pbchsim-scs"
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-securityContext:
-  privileged: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/physims/values.yaml

@@ -27,7 +27,6 @@ global:
     nrpbschsim106rb: dedale
     nrpbchsim217rb: dedale
     nrpbchsim273rb: dedale
-    nrpbchsimscs: dedale
     nrpsbchsim: dedale
     nrprachsim: dedale
     nrpucchsim: dedale

ci-scripts/Jenkinsfile-GitLab-Container

@@ -285,29 +285,6 @@ pipeline {
             }
           }
         }
-        stage ("OAI-FLEXRIC-RAN-Integration-Test") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('OAI-FLEXRIC-RAN-Integration-Test', 'OAI-FLEXRIC-RAN-Integration-Test')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                flexricRAN5GStatus = finalizeSlaveJob('OAI-FLEXRIC-RAN-Integration-Test')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += flexricRAN5GStatus
-              }
-            }
-          }
-        }
         stage ("L2-Sim-Test-4G") {
           when { expression {do4Gtest} }
           steps {
@@ -516,6 +493,29 @@ pipeline {
             }
           }
         }
+        stage ("Interop-F1") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                f1InteropStatus = finalizeSlaveJob('RAN-Interop-F1')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += f1InteropStatus
+              }
+            }
+          }
+        }
         stage ("Sanity-Check OAI-CN5G") {
           when { expression {do5Gtest} }
           steps {

ci-scripts/Jenkinsfile-tmp-ran

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

ci-scripts/args_parse.py

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

ci-scripts/as_ue/aw2s-multi-00102-20.cfg

@@ -1,284 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 1
-#define N_ANTENNA_UL 1
-#define DL_ARFCN 631296
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver_20/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      ldpc_max_its:8,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-      global_timing_advance:-1,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "001020000000001",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "001020000000002",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "001020000000003",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "001020000000004",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "001020000000005",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "001020000000006",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "001020000000007",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "001020000000008",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "001020000000009",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "001020000000010",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "001020000000011",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "001020000000012",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "001020000000013",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "001020000000014",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "001020000000015",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "001020000000016",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}

ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg

@@ -5,7 +5,6 @@
 {
 #define N_ANTENNA_DL 2
 #define N_ANTENNA_UL 2
-#define DL_ARFCN 631296
 #define TDD 1
 
 log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
@@ -26,8 +25,8 @@ allow dynamic UE creation from remote API */
       rf_port: 0,
       bandwidth: 20,
       band: 78,
-      dl_nr_arfcn: DL_ARFCN,
-      ssb_nr_arfcn: DL_ARFCN,
+      dl_nr_arfcn:630048,
+      ssb_nr_arfcn:630048,
       subcarrier_spacing: 30,
       n_antenna_dl: N_ANTENNA_DL,
       n_antenna_ul: N_ANTENNA_UL,

ci-scripts/ci_infra.yaml

@@ -28,8 +28,8 @@ up2-fhi72:
 
 up2-aerial:
   Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
+  AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh
   NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
@@ -75,13 +75,6 @@ oc-cn5g-20897:
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
 
-oc-cn5g-20897-aerial2:
-  Host: aerial2
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-
 matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
@@ -118,11 +111,7 @@ ltebox-nepes:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-amarisoft_ue_2x2:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2.cfg &
   TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_fhi72:
   Host: amariue
@@ -389,6 +378,20 @@ rfsim4g_ue_fembms:
   CmdPrefix: docker exec rfsim4g-oai-lte-ue0
   IF: oaitun_uem1
 
+l2sim5g_ue:
+  Host: "%%current_host%%"
+  AttachScript: docker start l2sim-oai-nr-ue0
+  DetachScript: docker stop l2sim-oai-nr-ue0
+  NetworkScript: docker exec l2sim-oai-nr-ue0 ip a show dev oaitun_ue1
+  CmdPrefix: docker exec l2sim-oai-nr-ue0
+  IF: oaitun_ue1
+  MTU: 1500
+
+l2sim5g_ext_dn:
+  Host: "%%current_host%%"
+  NetworkScript: docker exec l2sim-oai-ext-dn ip a show dev eth0
+  CmdPrefix: docker exec l2sim-oai-ext-dn
+
 l2sim4g_ue:
   Host: "%%current_host%%"
   AttachScript: docker start l2sim4g-oai-lte-ue1

ci-scripts/cls_analysis.py

@@ -1,82 +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
-# */
-#---------------------------------------------------------------------
-
-import logging
-import re
-
-# Define the mapping of physim_test values to search patterns
-PHYSIM_PATTERN_MAPPING = {
-	'nr_ulsim': [
-		r'(Total PHY proc rx)\s+(\d+\.\d+)\s+us',  # Pattern for RX PHY processing time
-		r'(ULSCH total decoding time)\s+(\d+\.\d+)\s+us',  # Pattern for ULSCH decoding time
-	],
-	'nr_dlsim': [
-		r'(PHY proc tx)\s+(\d+\.\d+)\s+us',  # Pattern for TX PHY processing time
-		r'(DLSCH encoding time)\s+(\d+\.\d+)\s+us',  # Pattern for DLSCH encoding time
-	],
-	'ldpctest': [
-		r'(Encoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for encoding time mean
-		r'(Decoding time mean):\s+(\d+\.\d+)\s+us',  # Pattern for decoding time mean
-	],
-}
-# Define test conditions based on the simulation type
-PHYSIM_TEST_CONDITION = {
-	'nr_ulsim': 'test OK',  # For nr_ulsim, check if 'test OK' is present
-	'nr_dlsim': 'test OK',  # For nr_dlsim, check if 'test OK' is present
-	'ldpctest': None,	  # No condition for ldpctest, just process the patterns
-}
-
-class Analysis():
-
-	def analyze_physim(log, physim_test, options, threshold):
-		search_patterns = PHYSIM_PATTERN_MAPPING.get(physim_test)
-		test_condition = PHYSIM_TEST_CONDITION.get(physim_test)
-		success = False
-		msg = ''
-
-		try:
-			with open(log, 'r') as f:
-				log_content = f.read()
-		except FileNotFoundError as e:
-			msg = f'{log} file not found, exception: {e}'
-			return False, msg
-		except Exception as e:
-			msg = f'Error while parsing log file {log}: exception: {e}'
-			return False, msg
-
-		if test_condition and test_condition not in log_content:
-			msg = f"Test did not succeed, '{test_condition}' not found in log file {log}."
-			return False, msg
-
-		time1_match = re.search(search_patterns[0], log_content)
-		time2_match = re.search(search_patterns[1], log_content)
-		if not(time1_match and time2_match):
-			msg = f"Processing time not found in log file {log}."
-			return False, msg
-
-		success = float(time2_match.group(2)) < float(threshold)
-		if success:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us'
-		else:
-			msg = f'{time1_match.group(1)}: {time1_match.group(2)} us\n{time2_match.group(1)}: {time2_match.group(2)} us exceeds a limit of {threshold} us'
-
-		return success,msg

ci-scripts/cls_cluster.py

@@ -50,9 +50,9 @@ CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm"
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 		HELP.GenericHelp(CONST.Version)
-		raise ValueError('Insufficient Parameter: no OC Credentials')
+		sys.exit('Insufficient Parameter: no OC Credentials')
 	if OCRegistry.startswith("http") or OCRegistry.endswith("/"):
-		raise ValueError(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
+		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
 	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
 	if ret.returncode != 0:
 		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
@@ -73,7 +73,7 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
-	ret = cmd.run(f'helm install --wait --timeout 120s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
 	if ret.returncode != 0:
 		logging.error('OC OAI CN5G: Deployment failed')
 		OC_logout(cmd)
@@ -126,6 +126,8 @@ class Cluster:
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
 		self.cmd = None
+		self.imageToPull = ''
+		self.testSvrId = None
 
 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
@@ -238,47 +240,61 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')
 
-	def PullClusterImage(self, HTML, node, images):
-		logging.debug(f'Pull OC image {images} to server {node}')
+	def PullClusterImage(self, HTML, RAN):
+		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
+		if self.imageToPull == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
 		self.testCase_id = HTML.testCase_id
-		with cls_cmd.getConnection(node) as cmd:
-			succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
-			if not succeeded:
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
-			if ret.returncode != 0:
-				logging.error(f'cannot authenticate at registry')
-				OC_logout(cmd)
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, registry, None, None)
+		cmd = cls_cmd.getConnection(self.testSvrId)
+		logging.info(cmd.run('docker --version'))
+		succeeded = OC_login(cmd, self.OCUserName, self.OCPassword, CI_OC_RAN_NAMESPACE)
+		if not succeeded:
+			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		ret = cmd.run(f'oc whoami -t | docker login -u oaicicd --password-stdin {self.OCRegistry}')
+		if ret.returncode != 0:
+			logging.error(f'\u001B[1m Unable to access OC project {CI_OC_RAN_NAMESPACE}\u001B[0m')
 			OC_logout(cmd)
-		param = f"on node {node}"
-		if success:
-			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
-		else:
-			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
-		return success
+			cmd.close()
+			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
+			return False
+		for image in self.imageToPull:
+			imagePrefix = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
+			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tag}"
+			ret = cmd.run(f'docker pull {imagePrefix}/{imageTag}')
+			if ret.returncode != 0:
+				logging.error(f'Could not pull {image} from local registry : {self.OCRegistry}')
+				OC_logout(cmd)
+				cmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			cmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+		OC_logout(cmd)
+		cmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
+			sys.exit('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
 		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError('Insufficient Parameter: no OC Credentials')
+			sys.exit('Insufficient Parameter: no OC Credentials')
 		if self.OCRegistry.startswith("http") or self.OCRegistry.endswith("/"):
-			raise ValueError(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
+			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
 
 		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
 		self.cmd = cls_cmd.RemoteCmd(lIpAddr)

ci-scripts/cls_cmd.py

@@ -31,6 +31,7 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
+import sys
 import time
 
 SSHTIMEOUT=7

ci-scripts/cls_containerize.py

@@ -36,13 +36,20 @@ import re	       # reg
 import logging
 import os
 import shutil
+import subprocess
 import time
+import pyshark
+import threading
+import cls_cmd
+from multiprocessing import Process, Lock, SimpleQueue
 from zipfile import ZipFile
 
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import cls_cluster as OC
 import cls_cmd
+import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
@@ -51,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
 
 def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -70,8 +77,6 @@ def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranc
 	return ret.returncode == 0
 
 def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
-	if ranCommitID == 'develop':
-		return 'develop'
 	shortCommit = ranCommitID[0:8]
 	if ranAllowMerge:
 		# Allowing contributor to have a name/branchName format
@@ -145,6 +150,21 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
 		collectInfo[image] = files
 	return collectInfo
 
+def GetCredentials(instance):
+    server_id = instance.eNB_serverId[instance.eNB_instance]
+    if server_id == '0':
+        return (instance.eNBIPAddress, instance.eNBUserName, instance.eNBPassword, instance.eNBSourceCodePath)
+    elif server_id == '1':
+        return (instance.eNB1IPAddress, instance.eNB1UserName, instance.eNB1Password, instance.eNB1SourceCodePath)
+    elif server_id == '2':
+        return (instance.eNB2IPAddress, instance.eNB2UserName, instance.eNB2Password, instance.eNB2SourceCodePath)
+    else:
+        raise Exception ("Only supports maximum of 3 servers")
+
+def GetContainerName(ssh, svcName, file):
+	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".container_name'", silent=True)
+	return ret.stdout
+
 def GetImageName(ssh, svcName, file):
 	ret = ssh.run(f"docker compose -f {file} config --format json {svcName}  | jq -r '.services.\"{svcName}\".image'", silent=True)
 	if ret.returncode != 0:
@@ -152,31 +172,31 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()
 
-def GetServiceHealth(ssh, svcName, file):
-	if svcName is None:
-		return False, f"Service {svcName} not found in {file}"
-	image = GetImageName(ssh, svcName, file)
-	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
-		return True, f"Service {svcName} healthy, image {image}"
-	for _ in range(8):
-		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
+def GetContainerHealth(ssh, containerName):
+	if containerName is None:
+		return False
+	if 'db_init' in containerName or 'db-init' in containerName: # exits with 0, there cannot be healthy
+		return True
+	time.sleep(5)
+	for _ in range(3):
+		result = ssh.run(f'docker inspect --format="{{{{.State.Health.Status}}}}" {containerName}', silent=True)
 		if result.stdout == 'healthy':
-			return True, f"Service {svcName} healthy, image {image}"
-		time.sleep(5)
-	return False, f"Failed to deploy: service {svcName}"
+			return True
+		time.sleep(10)
+	return False
 
 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
-	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
+	ret = ssh.run(f'cat {wd}/.env', silent=True)
 	if ret.returncode != 0:
 		return False
 	env_vars = ret.stdout.strip().splitlines()
 	logging.info(f'{prompt} {wd}/.env: {env_vars}')
 	return True
 
-def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
-	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
+def WriteEnvFile(ssh, services, wd, tag):
+	ret = ssh.run(f'cat {wd}/.env', silent=True)
 	registry = "oai-ci" # pull_images() gives us this registry path
-	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
+	envs = {"REGISTRY":registry, "TAG": tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
 		old_envs = {}
@@ -194,9 +214,7 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
-			if "oai-enb" in image: envs["ENB_IMG"] = "oai-enb-asan"
-			elif "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
-			elif "oai-lte-ue" in image: envs["LTEUE_IMG"] = "oai-lte-ue-asan"
+			if "oai-gnb" in image: envs["GNB_IMG"] = "oai-gnb-asan"
 			elif "oai-nr-ue" in image: envs["NRUE_IMG"] = "oai-nr-ue-asan"
 			elif "oai-nr-cuup" in image: envs["NRCUUP_IMG"] = "oai-nr-cuup-asan"
 			else: logging.warning("undetected image format {image}, cannot use asan")
@@ -215,10 +233,11 @@ def GetServices(ssh, requested, file):
     else:
         return requested
 
-def CopyinServiceLog(ssh, lSourcePath, yaml, svcName, wd_yaml, filename):
+def CopyinContainerLog(ssh, lSourcePath, yaml, containerName, filename):
 	remote_filename = f"{lSourcePath}/cmake_targets/log/{filename}"
-	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
+	ssh.run(f'docker logs {containerName} &> {remote_filename}')
 	local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml}"
+	os.system(f'mkdir -p {local_dir}')
 	local_filename = f"{local_dir}/{filename}"
 	return ssh.copyin(remote_filename, local_filename)
 
@@ -331,33 +350,38 @@ class Containerize():
 		self.cliOptions = ''
 
 		self.imageToCopy = ''
+		self.registrySvrId = ''
+		self.testSvrId = ''
+		self.imageToPull = []
 		#checkers from xml
 		self.ran_checkers={}
-		self.num_attempts = 1
-
-		self.flexricTag = ''
 
 #-----------------------------------------------------------
 # Container management functions
 #-----------------------------------------------------------
 
-	def GetCredentials(self, server_id):
-		if server_id == '0':
-			ip, path = self.eNBIPAddress, self.eNBSourceCodePath
-		elif server_id == '1':
-			ip, path = self.eNB1IPAddress, self.eNB1SourceCodePath
-		elif server_id == '2':
-			ip, path = self.eNB2IPAddress, self.eNB2SourceCodePath
-		else:
-			raise ValueError(f"unknown server ID '{server_id}'")
-		if ip == '' or path == '':
-			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: IP/node {ip}, path {path}')
-		return (ip, path)
-
 	def BuildImage(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.RemoteCmd(lIpAddr)
 	
@@ -397,9 +421,7 @@ class Containerize():
 				imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 				# Building again the 5G images with Address Sanitizer
 				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
@@ -555,12 +577,50 @@ class Containerize():
 			return False
 
 	def BuildProxy(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.proxyCommit is None:
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter (need proxyCommit for proxy build)')
 		logging.debug('Building on server: ' + lIpAddr)
-		ssh = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
+
+		# Check that we are on Ubuntu
+		mySSH.command('hostnamectl', '\$', 5)
+		result = re.search('Ubuntu',  mySSH.getBefore())
+		self.host = result.group(0)
+		if self.host != 'Ubuntu':
+			logging.error('\u001B[1m Can build proxy only on Ubuntu server\u001B[0m')
+			mySSH.close()
+			sys.exit(1)
+
+		self.cli = 'docker'
+		self.cliBuildOptions = ''
+
+		# Workaround for some servers, we need to erase completely the workspace
+		if self.forcedWorkspaceCleanup:
+			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
 
-		self.testCase_id = HTML.testCase_id
 		oldRanCommidID = self.ranCommitID
 		oldRanRepository = self.ranRepository
 		oldRanAllowMerge = self.ranAllowMerge
@@ -569,38 +629,30 @@ class Containerize():
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
 		self.ranTargetBranch = 'master'
+		mySSH.command('cd ' +lSourcePath, '\$', 3)
+		# to prevent accidentally overwriting data that might be used later
+		self.ranCommitID = oldRanCommidID
+		self.ranRepository = oldRanRepository
+		self.ranAllowMerge = oldRanAllowMerge
+		self.ranTargetBranch = oldRanTargetBranch
 
 		# Let's remove any previous run artifacts if still there
-		ssh.run('docker image prune --force')
+		mySSH.command(self.cli + ' image prune --force', '\$', 30)
 		# Remove any previous proxy image
-		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')
+		mySSH.command(self.cli + ' image rm oai-lte-multi-ue-proxy:latest || true', '\$', 30)
 
 		tag = self.proxyCommit
 		logging.debug('building L2sim proxy image for tag ' + tag)
 		# check if the corresponding proxy image with tag exists. If not, build it
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		buildProxy = ret.returncode != 0 # if no image, build new proxy
+		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		buildProxy = mySSH.getBefore().count('o such image') != 0
 		if buildProxy:
-			ssh.run(f'rm -Rf {lSourcePath}')
-			success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-			if not success:
-				raise Exception("could not clone proxy repository")
-
-			filename = f'build_log_{self.testCase_id}'
-			fullpath = f'{lSourcePath}/{filename}'
-
-			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
-			ssh.run(f'zip -r -qq {fullpath}.zip {fullpath}')
-			local_file = f"{os.getcwd()}/../cmake_targets/log/{filename}.zip"
-			ssh.copyin(f'{fullpath}.zip', local_file)
-			# don't delete such that we might recover the zips
-			#ssh.run(f'rm -f {fullpath}.zip')
-
-			ssh.run('docker image prune --force')
-			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-			if ret.returncode != 0:
+			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target oai-lte-multi-ue-proxy --tag proxy:' + tag + ' --file docker/Dockerfile.ubuntu18.04 . > cmake_targets/log/proxy-build.log 2>&1', '\$', 180)
+			mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+			mySSH.command(self.cli + ' image prune --force || true','\$', 15)
+			if mySSH.getBefore().count('o such image') != 0:
 				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
-				ssh.close()
+				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
 				return False
@@ -608,20 +660,33 @@ class Containerize():
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
 
 		# retag the build images to that we pick it up later
-		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')
+		mySSH.command('docker image tag proxy:' + tag + ' oai-lte-multi-ue-proxy:latest', '\$', 5)
+
+		# no merge: is a push to develop, tag the image so we can push it to the registry
+		if not self.ranAllowMerge:
+			mySSH.command('docker image tag proxy:' + tag + ' proxy:develop', '\$', 5)
 
 		# we assume that the host on which this is built will also run the proxy. The proxy
 		# currently requires the following command, and the docker-compose up mechanism of
 		# the CI does not allow to run arbitrary commands. Note that the following actually
 		# belongs to the deployment, not the build of the proxy...
 		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
-		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')
+		mySSH.command('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up', '\$', 5)
 
-		# to prevent accidentally overwriting data that might be used later
-		self.ranCommitID = oldRanCommidID
-		self.ranRepository = oldRanRepository
-		self.ranAllowMerge = oldRanAllowMerge
-		self.ranTargetBranch = oldRanTargetBranch
+		# Analyzing the logs
+		if buildProxy:
+			self.testCase_id = HTML.testCase_id
+			mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+			mySSH.command('mkdir -p proxy_build_log_' + self.testCase_id, '\$', 5)
+			mySSH.command('mv log/* ' + 'proxy_build_log_' + self.testCase_id, '\$', 5)
+			if (os.path.isfile('./proxy_build_log_' + self.testCase_id + '.zip')):
+				os.remove('./proxy_build_log_' + self.testCase_id + '.zip')
+			if (os.path.isdir('./proxy_build_log_' + self.testCase_id)):
+				shutil.rmtree('./proxy_build_log_' + self.testCase_id)
+			mySSH.command('zip -r -qq proxy_build_log_' + self.testCase_id + '.zip proxy_build_log_' + self.testCase_id, '\$', 5)
+			mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
+			# don't delete such that we might recover the zips
+			#mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
 
 		# 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
@@ -633,11 +698,11 @@ class Containerize():
 		files['Target Image Creation'] = errorandwarnings
 		collectInfo = {}
 		collectInfo['proxy'] = files
-		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
-		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
+		mySSH.command('docker image inspect --format=\'Size = {{.Size}} bytes\' proxy:' + tag, '\$', 5)
+		result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
 		# Cleaning any created tmp volume
-		ssh.run('docker volume prune --force')
-		ssh.close()
+		mySSH.command(self.cli + ' volume prune --force || true','\$', 15)
+		mySSH.close()
 
 		allImagesSize = {}
 		if result is not None:
@@ -657,8 +722,27 @@ class Containerize():
 			return False
 
 	def BuildRunTests(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
 		cmd = cls_cmd.RemoteCmd(lIpAddr)
 		cmd.cd(lSourcePath)
@@ -705,7 +789,7 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
+		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
 		cmd.run(f'docker rmi ran-unittests:{baseTag}')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -720,16 +804,34 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def Push_Image_to_Local_Registry(self, HTML, svr_id):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
+	def Push_Image_to_Local_Registry(self, HTML):
+		if self.registrySvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.registrySvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.registrySvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('Pushing images from server: ' + lIpAddr)
-		ssh = cls_cmd.getConnection(lIpAddr)
+		mySSH = SSH.SSHConnection()
+		mySSH.open(lIpAddr, lUserName, lPassWord)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
-		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
-		if ret.returncode != 0:
+		mySSH.command(f'docker login -u oaicicd -p oaicicd {imagePrefix}', '\$', 5)
+		if re.search('Login Succeeded', mySSH.getBefore()) is None:
 			msg = 'Could not log into local registry'
 			logging.error(msg)
-			ssh.close()
+			mySSH.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
@@ -739,99 +841,148 @@ class Containerize():
 		for image in IMAGES:
 			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
-			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
+			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}', '\$', 5)
+			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
 				continue
-			ret = ssh.run(f'docker push {imagePrefix}/{imageTag}')
-			if ret.returncode != 0:
+			mySSH.command(f'docker push {imagePrefix}/{imageTag}', '\$', 120)
+			if re.search(': digest:', mySSH.getBefore()) is None:
+				logging.debug(mySSH.getBefore())
 				msg = f'Could not push {image} to local registry : {imageTag}'
 				logging.error(msg)
-				ssh.close()
+				mySSH.close()
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
-			# Creating a develop tag on the local private registry
-			if not self.ranAllowMerge:
-				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:develop')
-				ssh.run(f'docker push {imagePrefix}/{image}:develop')
-				ssh.run(f'docker rmi {imagePrefix}/{image}:develop')
-			ssh.run(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}')
+			mySSH.command(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}', '\$', 30)
 
-		ret = ssh.run(f'docker logout {imagePrefix}')
-		if ret.returncode != 0:
+		mySSH.command(f'docker logout {imagePrefix}', '\$', 5)
+		if re.search('Removing login credentials', mySSH.getBefore()) is None:
 			msg = 'Could not log off from local registry'
 			logging.error(msg)
-			ssh.close()
+			mySSH.close()
 			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 			return False
 
-		ssh.close()
+		mySSH.close()
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
 
-	def Pull_Image(cmd, images, tag, registry, username, password):
-		if username is not None and password is not None:
-			logging.info(f"logging into registry {username}@{registry}")
-			response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False)
-			if response.returncode != 0:
-				msg = f'Could not log into registry {username}@{registry}'
-				logging.error(msg)
-				return False, msg
-		pulled_images = []
-		for image in images:
-			imageTag = f"{image}:{tag}"
-			response = cmd.run(f'docker pull {registry}/{imageTag}')
-			if response.returncode != 0:
-				msg = f'Could not pull {image} from local registry: {imageTag}'
-				logging.error(msg)
-				return False, msg
-			cmd.run(f'docker tag {registry}/{imageTag} oai-ci/{imageTag}')
-			cmd.run(f'docker rmi {registry}/{imageTag}')
-			pulled_images += [f"oai-ci/{imageTag}"]
-		if username is not None and password is not None:
-			response = cmd.run(f'docker logout {registry}')
-			# we have the images, if logout fails it's no problem
-		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
-		return True, msg
-
-	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
+	def Pull_Image_from_Local_Registry(self, HTML):
+		# This method can be called either onto a remote server (different from python executor)
+		# or directly on the python executor (ie lIpAddr == 'none')
+		if self.testSvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.testSvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.testSvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
-		if not tag:
-			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-		with cls_cmd.getConnection(lIpAddr) as cmd:
-			success, msg = Containerize.Pull_Image(cmd, images, tag, registry, username, password)
-		param = f"on node {lIpAddr}"
-		if success:
-			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])
+		myCmd = cls_cmd.getConnection(lIpAddr)
+		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
+		response = myCmd.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
+		if response.returncode != 0:
+			msg = 'Could not log into local registry'
+			logging.error(msg)
+			myCmd.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+		pulled_images = []
+		for image in self.imageToPull:
+			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tagToUse}"
+			cmd = f'docker pull {imagePrefix}/{imageTag}'
+			response = myCmd.run(cmd, timeout=120)
+			if response.returncode != 0:
+				logging.debug(response)
+				msg = f'Could not pull {image} from local registry : {imageTag}'
+				logging.error(msg)
+				myCmd.close()
+				HTML.CreateHtmlTestRow('msg', 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+			myCmd.run(f'docker tag {imagePrefix}/{imageTag} oai-ci/{imageTag}')
+			myCmd.run(f'docker rmi {imagePrefix}/{imageTag}')
+			pulled_images += [f"oai-ci/{imageTag}"]
+		response = myCmd.run(f'docker logout {imagePrefix}')
+		if response.returncode != 0:
+			msg = 'Could not log off from local registry'
+			logging.error(msg)
+			myCmd.close()
+			HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+		myCmd.close()
+		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
+		HTML.CreateHtmlTestRowQueue('N/A', 'OK', [msg])
+		return True
+
+	def Clean_Test_Server_Images(self, HTML):
+		# This method can be called either onto a remote server (different from python executor)
+		# or directly on the python executor (ie lIpAddr == 'none')
+		if self.testSvrId == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.testSvrId == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.testSvrId == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		if lIpAddr != 'none':
+			logging.debug('Removing test images from server: ' + lIpAddr)
+			myCmd = cls_cmd.RemoteCmd(lIpAddr)
 		else:
-			HTML.CreateHtmlTestRowQueue(param, 'KO', [msg])
-		return success
+			logging.debug('Removing test images locally')
+			myCmd = cls_cmd.LocalCmd()
 
-	def Clean_Test_Server_Images(self, HTML, svr_id, images, tag=None):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
-		logging.debug(f'\u001B[1m Cleaning image(s) from server: {lIpAddr}\u001B[0m')
-		if not tag:
+		for image in IMAGES:
 			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			imageTag = f"{image}:{tag}"
+			cmd = f'docker rmi oai-ci/{imageTag}'
+			myCmd.run(cmd, reportNonZero=False)
 
-		status = True
-		with cls_cmd.getConnection(lIpAddr) as myCmd:
-			removed_images = []
-			for image in images:
-				fullImage = f"oai-ci/{image}:{tag}"
-				cmd = f'docker rmi {fullImage}'
-				if myCmd.run(cmd).returncode != 0:
-					status = False
-				removed_images += [fullImage]
-
-		msg = "Removed Images:\n" + '\n'.join(removed_images)
-		s = 'OK' if status else 'KO'
-		param = f"on node {lIpAddr}"
-		HTML.CreateHtmlTestRowQueue(param, s, [msg])
-		return status
+		myCmd.close()
+		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+		return True
 
 	def Create_Workspace(self,HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		
 		success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
@@ -840,60 +991,60 @@ class Containerize():
 		return success
 
 	def DeployObject(self, HTML):
-		svr = self.eNB_serverId[self.eNB_instance]
-		num_attempts = self.num_attempts
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
-		logging.debug(f'Deploying OAI Object on server: {lIpAddr}')
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		logging.debug('\u001B[1m Deploying OAI Object on server: ' + lIpAddr + '\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
-		# creating the log folder by default
-		local_dir = f"{os.getcwd()}/../cmake_targets/log/{yaml.split('/')[-1]}"
-		os.system(f'mkdir -p {local_dir}')
 		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
-		yaml_dir = yaml.split('/')[-1]
+
 		with cls_cmd.getConnection(lIpAddr) as ssh:
-			services = GetServices(ssh, self.services[self.eNB_instance], wd_yaml)
+			services = GetServices(ssh, self.services[self.eNB_instance], f"{wd}/docker-compose.y*ml")
 			if services == [] or services == ' ' or services == None:
-				msg = 'Cannot determine services to start'
+				msg = "Cannot determine services to start"
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
+
 			ExistEnvFilePrint(ssh, wd)
-			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
-			if num_attempts <= 0:
-				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
-			for attempt in range(num_attempts):
-				imagesInfo = []
-				healthInfo = []
-				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
-				if status.returncode != 0:
-					msg = f'cannot deploy services {services}: {status.stdout}'
-					logging.error(msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
-					return False
-				for svc in services.split():
-					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
-					logging.info(msg)
-					imagesInfo.append(msg)
-					healthInfo.append(health)
-				deployed = all(healthInfo)
-				if deployed:
-					break
-				elif (attempt < num_attempts - 1):
-					logging.warning(f'Failed to deploy on attempt {attempt}, restart services {services}')
-					for svc in services.split():
-						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
-					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
-		if deployed:
+			WriteEnvFile(ssh, services, wd, self.deploymentTag)
+
+			logging.info(f"will start services {services}")
+			status = ssh.run(f'docker compose -f {wd}/docker-compose.y*ml up -d -- {services}')
+			if status.returncode != 0:
+				msg = f"cannot deploy services {services}: {status.stdout}"
+				logging.error(msg)
+				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
+				return False
+
+			imagesInfo = []
+			fstatus = True
+			for svc in services.split():
+				containerName = GetContainerName(ssh, svc, f"{wd}/docker-compose.y*ml")
+				healthy = GetContainerHealth(ssh, containerName)
+				if not healthy:
+					tgtlogfile = f'{svc}-{HTML.testCase_id}.log'
+					logging.warning(f"Deployment Failed: Trying to copy container logs to {tgtlogfile}")
+					yaml_dir = yaml.split('/')[-1]
+					CopyinContainerLog(ssh, lSourcePath, yaml_dir, containerName, tgtlogfile)
+					imagesInfo += [f"Failed to deploy: service {svc}"]
+					fstatus = False
+				else:
+					image = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
+					logging.info(f"service {svc} healthy, container {containerName}, image {image}")
+					imagesInfo += [f"service {svc} healthy, image {image}"]
+		if fstatus:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
-		return deployed
+		return fstatus
 
 	def UndeployObject(self, HTML, RAN):
-		svr = self.eNB_serverId[self.eNB_instance]
-		lIpAddr, lSourcePath = self.GetCredentials(svr)
+		lIpAddr, lUserName, lPassWord, lSourcePath = GetCredentials(self)
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
 		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {lIpAddr}\u001B[0m')
 		yaml = self.yamlPath[self.eNB_instance].strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -905,7 +1056,7 @@ class Containerize():
 			if services is not None:
 				all_serv = " ".join([s for s, _ in services])
 				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
-				copyin_res = all(CopyinServiceLog(ssh, lSourcePath, yaml_dir, s, f"{wd}/docker-compose.y*ml", f'{s}-{HTML.testCase_id}.log') for s, c in services)
+				copyin_res = all(CopyinContainerLog(ssh, lSourcePath, yaml_dir, c, f'{s}-{HTML.testCase_id}.log') for s, c in services)
 			else:
 				logging.warning('could not identify services to stop => no log file')
 			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
@@ -921,3 +1072,121 @@ class Containerize():
 		else:
 			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		return success
+
+	def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
+		logging.debug('Checking IP routing on ' + svrName)
+		mySSH = SSH.SSHConnection()
+		if svrName == 'porcepix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to asterix gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
+			result = re.search('172.21.16.127', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
+			# Check if route to obelix enb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.128', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev eno1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'asterix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to porcepix epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev em1', '\$', 10)
+			# Check if route to porcepix cn5g exists
+			mySSH.command('ip route | grep --colour=never "192.168.70.128/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.70.128/26 via 172.21.16.136 dev em1', '\$', 10)
+			# Check if X2 route to obelix enb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.128', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.128 dev em1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'obelix':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to porcepix epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.61.192/26"', '\$', 10)
+			result = re.search('172.21.16.136', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.61.192/26 via 172.21.16.136 dev eno1', '\$', 10)
+			# Check if X2 route to asterix gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.64/26"', '\$', 10)
+			result = re.search('172.21.16.127', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.64/26 via 172.21.16.127 dev eno1', '\$', 10)
+			# Check if X2 route to nepes gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.137', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.137 dev eno1', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'nepes':
+			mySSH.open(ipAddr, userName, password)
+			# Check if route to ofqot gnb exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.192/26"', '\$', 10)
+			result = re.search('172.21.16.109', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.192/26 via 172.21.16.109 dev enp0s31f6', '\$', 10)
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()
+		if svrName == 'ofqot':
+			mySSH.open(ipAddr, userName, password)
+			# Check if X2 route to nepes enb/epc exists
+			mySSH.command('ip route | grep --colour=never "192.168.68.128/26"', '\$', 10)
+			result = re.search('172.21.16.137', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S ip route add 192.168.68.128/26 via 172.21.16.137 dev enp2s0', '\$', 10)
+			# Check if forwarding is enabled
+			mySSH.command('sysctl net.ipv4.conf.all.forwarding', '\$', 10)
+			result = re.search('net.ipv4.conf.all.forwarding = 1', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S sysctl net.ipv4.conf.all.forwarding=1', '\$', 10)
+			# Check if iptables forwarding is accepted
+			mySSH.command('echo ' + password + ' | sudo -S iptables -L FORWARD', '\$', 10)
+			result = re.search('Chain FORWARD .*policy ACCEPT', mySSH.getBefore())
+			if result is None:
+				mySSH.command('echo ' + password + ' | sudo -S iptables -P FORWARD ACCEPT', '\$', 10)
+			mySSH.close()

ci-scripts/cls_module.py

@@ -25,10 +25,14 @@
 #---------------------------------------------------------------------
 
 #to use isfile
+import os
+import sys
 import logging
 #time.sleep
 import time
 import re
+import subprocess
+from datetime import datetime
 import yaml
 
 import cls_cmd
@@ -204,6 +208,13 @@ class Module_UE:
 
 	def _enableTrace(self):
 		raise Exception("not implemented")
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
+		#delete old artifacts
+		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
+		#start Trace, artifact is created in home dir
+		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
+		mySSH.close()
 
 	def _disableTrace(self):
 		raise Exception("not implemented")

ci-scripts/cls_native.py

@@ -22,15 +22,11 @@
 
 import logging
 import re
-import os
 
 import cls_cmd
 import cls_oai_html
-import cls_analysis
 import constants as CONST
 
-LOG_PATH_PHYSIM = 'phy_sim_logs'
-
 class Native():
 
 	def Build(test_case, HTML, host, directory, options):
@@ -66,19 +62,3 @@ class Native():
 			logging.error('\u001B[1m Building OAI Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(options, 'KO', CONST.ALL_PROCESSES_OK)
 		return success
-
-	def Run_Physim(HTML, host, directory, options, physim_test, threshold):
-		logging.debug(f'Runnin {physim_test} on server: {host}')
-		workSpacePath = f'{directory}/cmake_targets'
-		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')
-		runLogFile=f'physim_{HTML.testCase_id}.log'
-		with cls_cmd.getConnection(host) as cmd:
-			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')
-			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')
-		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)
-		if success:
-			HTML.CreateHtmlTestRowQueue(options, 'OK', [msg])
-		else:
-			logging.error(msg)
-			HTML.CreateHtmlTestRowQueue(options, 'KO', [msg])
-		return success

ci-scripts/cls_oai_html.py

@@ -31,12 +31,14 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
+import sys              # arg
 import re               # reg
 import fileinput
 import logging
 import os
 import time
 import subprocess
+from multiprocessing import Process, Lock, SimpleQueue
 
 import constants as CONST
 
@@ -147,7 +149,7 @@ class HTMLManagement():
 				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
 			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
+			if self.ranAllowMerge != '':
 				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
 				commit_message = commit_message.strip()
 				self.htmlFile.write('     <tr>\n')

ci-scripts/cls_oaicitest.py

@@ -34,6 +34,7 @@
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
+import pexpect	# pexpect
 import time		# sleep
 import os
 import logging
@@ -43,10 +44,16 @@ import json
 #import our libs
 import helpreadme as HELP
 import constants as CONST
+import cls_cluster as OC
+import sshconnection
 
 import cls_module
 import cls_cmd
 
+logging.getLogger("matplotlib").setLevel(logging.WARNING)
+import matplotlib.pyplot as plt
+import numpy as np
+
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 #-----------------------------------------------------------
@@ -648,7 +655,7 @@ class OaiCiTest():
 				result = re.search('warning: discard PDU, sn out of window', str(line))
 				if result is not None:
 					nbPduDiscard += 1
-				result = re.search('--nfapi STANDALONE_PNF --node-number 2', str(line))
+				result = re.search('--nfapi STANDALONE_PNF --node-number 2 --sa', str(line))
 				if result is not None:
 					frequency_found = True
 			result = re.search('Exiting OAI softmodem', str(line))
@@ -894,43 +901,55 @@ class OaiCiTest():
 			SourceCodePath = self.UESourceCodePath
 		else:
 			sys.exit('Insufficient Parameter')
-		with cls_cmd.getConnection(IPAddress) as cmd:
-			d = f'{SourceCodePath}/cmake_targets'
-			cmd.run(f'rm -f {d}/build.log.zip')
-			cmd.run(f'cd {d} && zip -r build.log.zip build_log_*/*')
+		SSH = sshconnection.SSHConnection()
+		SSH.open(IPAddress, UserName, Password)
+		SSH.command(f'cd {SourceCodePath}', '\$', 5)
+		SSH.command('cd cmake_targets', '\$', 5)
+		SSH.command('rm -f build.log.zip', '\$', 5)
+		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
+		SSH.close()
 
 	def LogCollectPing(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if EPC.IPAddress == 'none':
 			sys.exit(0)
-		with cls_cmd.getConnection(EPC.IPAddress) as cmd:
-			d = f"{EPC.SourceCodePath}/scripts"
-			cmd.run(f'rm -f {d}/ping.log.zip')
-			cmd.run(f'cd {d} && zip ping.log.zip ping*.log')
-			cmd.run(f'rm {d}/ping*.log')
+		SSH = sshconnection.SSHConnection()
+		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd scripts', '\$', 5)
+		SSH.command('rm -f ping.log.zip', '\$', 5)
+		SSH.command('zip ping.log.zip ping*.log', '\$', 60)
+		SSH.command('rm ping*.log', '\$', 5)
+		SSH.close()
 
 	def LogCollectIperf(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if EPC.IPAddress == 'none':
 			sys.exit(0)
-		with cls_cmd.getConnection(EPC.IPAddress) as cmd:
-			d = f"{EPC.SourceCodePath}/scripts"
-			cmd.run(f'rm -f {d}/iperf.log.zip')
-			cmd.run(f'cd {d} && zip iperf.log.zip iperf*.log')
-			cmd.run(f'rm {d}/iperf*.log')
+		SSH = sshconnection.SSHConnection()
+		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+		SSH.command(f'cd {EPC.SourceCodePath}', '\$', 5)
+		SSH.command('cd scripts', '\$', 5)
+		SSH.command('rm -f iperf.log.zip', '\$', 5)
+		SSH.command('zip iperf.log.zip iperf*.log', '\$', 60)
+		SSH.command('rm iperf*.log', '\$', 5)
+		SSH.close()
 	
 	def LogCollectOAIUE(self):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
 		if self.UEIPAddress == 'none':
 			sys.exit(0)
-		with cls_cmd.getConnection(self.UEIPAddress) as cmd:
-			d = f'{self.UESourceCodePath}/cmake_targets'
-			cmd.run(f'echo {self.UEPassword} | sudo -S rm -f {d}/ue.log.zip')
-			cmd.run(f'cd {d} && echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt')
-			cmd.run(f'echo {self.UEPassword} | sudo -S rm {d}/ue*.log {d}/core* {d}/ue_*record.raw {d}/ue_*.pcap {d}/ue_*txt')
+		SSH = sshconnection.SSHConnection()
+		SSH.open(self.UEIPAddress, self.UEUserName, self.UEPassword)
+		SSH.command(f'cd {self.UESourceCodePath}', '\$', 5)
+		SSH.command(f'cd cmake_targets', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm -f ue.log.zip', '\$', 5)
+		SSH.command(f'echo {self.UEPassword} | sudo -S zip ue.log.zip ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 60)
+		SSH.command(f'echo {self.UEPassword} | sudo -S rm ue*.log core* ue_*record.raw ue_*.pcap ue_*txt', '\$', 5)
+		SSH.close()
 
 	def ShowTestID(self):
 		logging.info(f'\u001B[1m----------------------------------------\u001B[0m')

ci-scripts/cls_physim.py

@@ -0,0 +1,263 @@
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+# Python for CI of OAI-eNB + COTS-UE
+#
+#   Required Python Version
+#     Python 3.x
+#
+#   Required Python Package
+#     pexpect
+#---------------------------------------------------------------------
+
+#to use logging.info()
+import logging
+#to create a SSH object locally in the methods
+import sshconnection
+#to update the HTML object
+import cls_oai_html
+import cls_cmd
+from multiprocessing import SimpleQueue
+#for log folder maintenance
+import os
+import re
+
+class PhySim:
+	def __init__(self):
+		self.buildargs = ""
+		self.runargs = ""
+		self.eNBIpAddr = ""
+		self.eNBUserName = ""
+		self.eNBPassWord = ""
+		self.eNBSourceCodePath = ""
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID= ""
+		self.ranAllowMerge= ""
+		self.ranTargetBranch= ""
+		self.forced_workspace_cleanup=False
+		#private attributes
+		self.__workSpacePath=''
+		self.__buildLogFile='compile_phy_sim.log'
+		self.__runLogFile=''
+		self.__runLogPath='phy_sim_logs'
+
+
+#-----------------
+#PRIVATE Methods
+#-----------------
+
+	def __CheckResults_LDPCcudaTest(self,HTML,CONST,testcase_id):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve run log file and store it locally$
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__runLogFile, '.')
+		mySSH.close()
+		#parse results looking for Encoding and Decoding mean values
+		runResults=[]
+		with open(self.__runLogFile) as f:
+			for line in f:
+				if 'mean' in line:
+					runResults.append(line)
+		#the values are appended for each mean value (2), so we take these 2 values from the list
+		info = runResults[0] + runResults[1]
+
+		#once parsed move the local logfile to its folder for tidiness
+		os.system('mv '+self.__runLogFile+' '+ self.__runLogPath+'/.')
+
+		HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		return True
+
+	def __CheckResults_LDPCt2Test(self,HTML,CONST,testcase_id):
+		thrs_KO = int(self.timethrs)
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+		#retrieve run log file and store it locally$
+		mySSH.copyin(f'{self.__workSpacePath}{self.__runLogFile}', f'{self.__runLogFile}')
+		mySSH.close()
+		#parse results looking for encoder/decoder processing time values
+
+		with open(self.__runLogFile) as g:
+			for line in g:
+				res_enc = re.search(r"DLSCH encoding time\s+(\d+\.\d+)\s+us",line)
+				res_dec = re.search(r'ULSCH total decoding time\s+(\d+\.\d+)\s+us',line)
+				if res_dec is not None:
+					time = res_dec.group(1)
+					info = res_dec.group(0)
+					break
+				if res_enc is not None:
+					time = res_enc.group(1)
+					info = res_enc.group(0)
+					break
+
+		# In case the T2 board does work properly, there is no statistics
+		if res_enc is None and res_dec is None:
+			logging.error(f'no statistics: res_enc {res_enc} res_dec {res_dec}')
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', ['no statistics'])
+			os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+			return False
+
+		#once parsed move the local logfile to its folder
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+		success = float(time) < thrs_KO
+		if success:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', [info])
+		else:
+			error_msg = f'Processing time exceeds a limit of {thrs_KO} us'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', [info + '\n' + error_msg])
+		return success
+
+	def __CheckResults_NRulsimTest(self, HTML, CONST, testcase_id):
+		#retrieve run log file and store it locally
+		mySSH = sshconnection.SSHConnection()
+		filename = self.__workSpacePath + self.__runLogFile
+		ret = mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, filename, '.')
+		if ret != 0:
+			error_msg = f'could not recover test result file {filename}'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue("could not recover results", 'KO', [error_msg])
+			return False
+
+		PUSCH_OK = False
+		with open(self.__runLogFile) as f:
+			PUSCH_OK = 'PUSCH test OK' in f.read()
+
+		# once parsed move the local logfile to its folder for tidiness
+		os.system(f'mv {self.__runLogFile} {self.__runLogPath}/.')
+
+		#updating the HTML with results
+		if PUSCH_OK:
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'OK', 1, ["succeeded"])
+		else:
+			error_msg = 'error: no "PUSCH test OK"'
+			logging.error(error_msg)
+			HTML.CreateHtmlTestRowQueue(self.runargs, 'KO', 1, [error_msg])
+		return PUSCH_OK
+
+	def __CheckBuild_PhySim(self, HTML, CONST):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		#retrieve compile log file and store it locally
+		mySSH.copyin(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord, self.__workSpacePath+self.__buildLogFile, '.')
+		#delete older run log file
+		mySSH.command('rm ' + self.__workSpacePath+self.__runLogFile, '\$', 5)
+		mySSH.close()
+		#check build result from local compile log file
+		with open(self.__buildLogFile) as f:
+			if 'BUILD SHOULD BE SUCCESSFUL' in f.read():
+				HTML.CreateHtmlTestRow(self.buildargs, 'OK', CONST.ALL_PROCESSES_OK, 'PhySim')
+				return True
+		logging.error('\u001B[1m Building Physical Simulators Failed\u001B[0m')
+		HTML.CreateHtmlTestRow(self.buildargs, 'KO', CONST.ALL_PROCESSES_OK, 'LDPC')
+		HTML.CreateHtmlTabFooter(False)
+		return False
+
+
+#-----------------$
+#PUBLIC Methods$
+#-----------------$
+
+	def Build_PhySim(self,htmlObj,constObj):
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+
+		#create working dir
+		mySSH.command('mkdir -p ' + self.eNBSourceCodePath, '\$', 5)
+		mySSH.command('cd ' + self.eNBSourceCodePath, '\$', 5)
+
+		if not self.ranRepository.lower().endswith('.git'):
+			self.ranRepository+='.git'
+
+		#git clone
+		mySSH.command('if [ ! -e .git ]; then stdbuf -o0 git clone '  + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+		#git config
+		mySSH.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
+		mySSH.command('git config user.name "OAI Jenkins"', '\$', 5)
+
+		#git clean depending on self.forced_workspace_cleanup captured in xml
+		if self.forced_workspace_cleanup==True:
+			logging.info('Cleaning workspace ...')
+			mySSH.command('echo ' + self.eNBPassWord + ' | sudo -S git clean -x -d -ff', '\$', 30)
+		else:
+			logging.info('Workspace cleaning was disabled')
+
+		# if the commit ID is provided, use it to point to it
+		if self.ranCommitID != '':
+			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
+		# if the branch is not develop, then it is a merge request and we need to do
+		# the potential merge. Note that merge conflicts should have already been checked earlier
+		if (self.ranAllowMerge):
+			if self.ranTargetBranch == '':
+				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
+					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
+			else:
+				logging.info('Merging with the target branch: ' + self.ranTargetBranch)
+				mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 30)
+
+		#build
+		mySSH.command('source oaienv', '\$', 5)
+		mySSH.command('cd cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p log', '\$', 5)
+		mySSH.command(f'./build_oai {self.buildargs} 2>&1 | tee {self.__buildLogFile}', '\$', 1500)
+
+		mySSH.close()
+		return __CheckBuild_PhySim(htmlObj,constObj)
+
+
+	def Run_CUDATest(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = self.eNBSourceCodePath+'/cmake_targets/'
+		#create run logs folder locally
+		os.system('mkdir -p ./'+self.__runLogPath)
+		#log file is tc_<testcase_id>.log remotely
+		self.__runLogFile='physim_'+str(testcase_id)+'.log'
+		#open a session for test run
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command('cd '+self.__workSpacePath,'\$',5)
+		#run and redirect the results to a log file
+		mySSH.command(self.__workSpacePath+'ran_build/build/ldpctest ' + self.runargs + ' >> '+self.__runLogFile, '\$', 30)
+		mySSH.close()
+		return self.__CheckResults_LDPCcudaTest(htmlObj,constObj,testcase_id)
+
+	def Run_T2Test(self,htmlObj,constObj,testcase_id):
+		self.__workSpacePath = f'{self.eNBSourceCodePath}/cmake_targets/'
+		#create run logs folder locally
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		#log file is tc_<testcase_id>.log remotely
+		self.__runLogFile=f'physim_{str(testcase_id)}.log'
+		#open a session for test run
+		mySSH = cls_cmd.getConnection(self.eNBIpAddr)
+		mySSH.run(f'cd {self.__workSpacePath}')
+		#run and redirect the results to a log file
+		mySSH.run(f'sudo {self.__workSpacePath}ran_build/build/{self.runsim} {self.runargs} > {self.__workSpacePath}{self.__runLogFile} 2>&1')
+		mySSH.close()
+		return self.__CheckResults_LDPCt2Test(htmlObj,constObj,testcase_id)
+
+	def Run_NRulsimTest(self, htmlObj, constObj, testcase_id):
+		self.__workSpacePath=self.eNBSourceCodePath+'/cmake_targets/'
+		os.system(f'mkdir -p ./{self.__runLogPath}')
+		self.__runLogFile = f'physim_{testcase_id}.log'
+		mySSH = sshconnection.SSHConnection()
+		mySSH.open(self.eNBIpAddr, self.eNBUserName, self.eNBPassWord)
+		mySSH.command(f'cd {self.__workSpacePath}', '\$', 5)
+		mySSH.command(f'sudo {self.__workSpacePath}ran_build/build/nr_ulsim {self.runargs} > {self.__runLogFile} 2>&1', '\$', 30)
+		mySSH.close()
+		return self.__CheckResults_NRulsimTest(htmlObj, constObj, testcase_id)

ci-scripts/cls_physim1.py

@@ -163,7 +163,7 @@ class PhySim:
 			mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
 			running_count = mySSH.getBefore().count('Running')
 			completed_count = mySSH.getBefore().count('Completed')
-			if (running_count + completed_count) == 23:
+			if (running_count + completed_count) == 22:
 				logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
 				isRunning = True
 				podNames = re.findall('oai-[\S\d\w]+', mySSH.getBefore())

ci-scripts/cls_static_code_analysis.py

@@ -36,6 +36,8 @@ import re               # reg
 import logging
 import os
 from pathlib import Path
+import time
+from multiprocessing import Process, Lock, SimpleQueue
 
 #-----------------------------------------------------------
 # OAI Testing modules

ci-scripts/conf_files/enb-rcc.band7.25prb.tm1.if4p5.conf

@@ -228,7 +228,7 @@ RUs = (
         nb_tx          = 1
         nb_rx          = 1
         att_tx         = 0
-        att_rx         = 6;
+        att_rx         = 0;
         eNB_instances  = [0];
     }
 );

ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf

@@ -230,7 +230,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
-         sdr_addrs      = "addr=192.168.80.250";
+         sdr_addrs      = "mgmt_addr=172.21.19.13,addr=192.168.80.250";
 
     }
 );  

ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf

@@ -191,7 +191,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band40.25prb.usrpb200.conf

@@ -191,7 +191,7 @@ RUs = (
          nb_tx          = 1
          nb_rx          = 1
          att_tx         = 6
-         att_rx         = 12;
+         att_rx         = 6;
          bands          = [38];
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 125;

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf

@@ -224,7 +224,7 @@ RUs =
     nb_tx                         = 1
     nb_rx                         = 1
     att_tx                        = 3
-    att_rx                        = 6;
+    att_rx                        = 0;
     bands                         = [7];
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 115;

ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "cu-rfsim");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cu.sa.f1.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-Eurecom-CU");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cucp.sa.f1.conf

@@ -1,6 +1,8 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf

@@ -1,6 +1,8 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cuup.sa.f1.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+sa = 1;
 
 gNBs =
 (

ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf

@@ -8,147 +8,149 @@ gNBs =
     ////////// Identification parameters:
     gNB_ID = 0xe00;
     gNB_DU_ID = 0xe00;
+
+#     cell_type =  "CELL_MACRO_GNB";
+
     gNB_name  =  "du-rfsim";
 
     // 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; }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
+
 
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
 
-    min_rxtxtime                                              = 4;
-    sib1_tda                                                  = 15;
+    min_rxtxtime                                              = 6;
 
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
 
-      physCellId                                               = 0;
+      physCellId                                                    = 0;
 
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                      = 430610;
-      dl_frequencyBand                                          = 66;
+      absoluteFrequencySSB                                          = 641280;
+      dl_frequencyBand                                                 = 78;
       # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                = 430000;
+      dl_absoluteFrequencyPointA                                       = 640008;
       #scs-SpecificCarrierList
-        dl_offstToCarrier                                       = 0;
+        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                    = 0;
-        dl_carrierBandwidth                                     = 25;
+# 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                         = 6600; # 6366 12925 12956 28875 12952
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                             = 0;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+        initialDLBWPsubcarrierSpacing                                           = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                        = 0;
-        initialDLBWPsearchSpaceZero                               = 0;
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                             = 0;
 
-  #uplinkConfigCommon
+  #uplinkConfigCommon 
      #frequencyInfoUL
-      ul_frequencyBand                                             = 66;
-      # this is 1750 MHz
-      ul_absoluteFrequencyPointA                                   = 350000;
+      ul_frequencyBand                                                 = 78;
       #scs-SpecificCarrierList
-      ul_offstToCarrier                                            = 0;
+      ul_offstToCarrier                                              = 0;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                         = 0;
-      ul_carrierBandwidth                                          = 25;
-      pMax                                                         = 20;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+      ul_subcarrierSpacing                                           = 1;
+      ul_carrierBandwidth                                            = 106;
+      pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                           = 6600;
+        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                              = 0;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+        initialULBWPsubcarrierSpacing                                           = 1;
       #rach-ConfigCommon
         #rach-ConfigGeneric
-          prach_ConfigurationIndex                                 = 98;
+          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;
+          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;
+          preambleTransMax                                          = 6;
 #powerRampingStep
 # 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                           = 1;
+        powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                          = 4;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR               = 4;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                  = 15;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                               = 7;
-        rsrp_ThresholdSSB                                          = 19;
+        ra_ContentionResolutionTimer                                = 7;
+        rsrp_ThresholdSSB                                           = 19;
 #prach-RootSequenceIndex_PR
 #1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                 = 2;
-        prach_RootSequenceIndex                                    = 1;
+        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                                     = 0,
+        #  
+        msg1_SubcarrierSpacing                                      = 1,
 # restrictedSetConfig
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                        = 0,
+        restrictedSetConfig                                         = 0,
 
-        msg3_DeltaPreamble                                         = 1;
-        p0_NominalWithGrant                                        =-90;
+        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;
+        pucchGroupHopping                                           = 0;
+        hoppingId                                                   = 40;
+        p0_nominal                                                  = -90;
 
-      ssb_PositionsInBurst_Bitmap                                  = 1;
+      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;
+# 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                                            = 0;
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
+      subcarrierSpacing                                             = 1;
 
 
   #tdd-UL-DL-ConfigurationCommon
 # subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                   = 0;
-      # pattern1
+# 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;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;
 
-      ssPBCH_BlockPower                                            = -25;
+      ssPBCH_BlockPower                                             = -25;
      }
 
   );
 
+
     # ------- SCTP definitions
     SCTP :
     {
@@ -159,50 +161,60 @@ gNBs =
   }
 );
 
-MACRLCs = ({
-    num_cc              = 1;
-    tr_s_preference     = "local_L1";
-    tr_n_preference     = "f1";
-    local_n_if_name     = "lo";
-    local_n_address     = "127.0.0.4";
-    remote_n_address    = "127.0.0.3";
-    local_n_portc       = 500;
-    local_n_portd       = 2152;
-    remote_n_portc      = 501;
-    remote_n_portd      = 2152;
-    pusch_FailureThres  = 1000;
-});
+MACRLCs = (
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_address = "192.168.72.142";
+    remote_n_address = "192.168.72.140";
+    local_n_portc   = 500;
+    local_n_portd   = 2152;
+    remote_n_portc  = 501;
+    remote_n_portd  = 2152;
+    pusch_TargetSNRx10          = 200;
+    pucch_TargetSNRx10          = 200;
+  }
+);
 
-L1s = ({
-    num_cc = 1;
-    tr_n_preference = "local_mac";
-    prach_dtx_threshold = 200;
-    pucch0_dtx_threshold = 150;
-    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
-});
+L1s = (
+{
+  num_cc = 1;
+  tr_n_preference = "local_mac";
+  prach_dtx_threshold = 200;
+  pucch0_dtx_threshold = 150;
+  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+}
+);
+
+RUs = (
+    {		  
+       local_rf       = "yes"
+         nb_tx          = 1
+         nb_rx          = 1
+         att_tx         = 0
+         att_rx         = 0;
+         bands          = [78];
+         max_pdschReferenceSignalPower = -27;
+         max_rxgain                    = 114;
+         eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
+         clock_src = "internal";
+    }
+);  
 
-RUs = ({
-    local_rf       = "yes"
-    nb_tx          = 1
-    nb_rx          = 1
-    att_tx         = 0
-    att_rx         = 0;
-    bands          = [66];
-    max_pdschReferenceSignalPower = -27;
-    max_rxgain                    = 114;
-    eNB_instances  = [0];
-    clock_src = "internal";
-});
 
 rfsimulator: {
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs"
+    serveraddr = "server";
+    serverport = 4043;
+    options = (); #("saviq"); or/and "chanmod"
+    modelname = "AWGN";
+    IQfile = "/tmp/rfsimulator.iqs"
 }
 
-log_config: {
+log_config :
+{
   global_log_level = "info";
   hw_log_level     = "info";
   nr_phy_log_level = "info";

ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf

@@ -195,6 +195,8 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 108;
          eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
          clock_src = "internal";
     }
 );

ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf

@@ -198,6 +198,8 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
          clock_src = "internal";
     }
 );  

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -200,6 +200,8 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
          clock_src = "internal";
     }
 );  

ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 nfapi = "AERIAL";
 
 gNBs =
@@ -188,7 +189,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
 
 
     NETWORK_INTERFACES :

ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf

@@ -187,6 +187,15 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+
          sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
          clock_src = "external";
          # if_freq = 3700000000L;

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -198,6 +198,15 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 50;
          eNB_instances  = [0];
+         ## beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ## beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         #bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+
          sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
     }
 );  

ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf

@@ -198,6 +198,15 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 50;
          eNB_instances  = [0];
+         ## beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ## beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         #bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+
          sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
     }
 );  

ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf

@@ -191,6 +191,7 @@ RUs = ({
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 50;
   eNB_instances  = [0];
+  bf_weights = [0x00007fff, 0x0000];
   sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
 });
 

ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf

@@ -193,6 +193,7 @@ RUs = ({
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 50;
   eNB_instances  = [0];
+  bf_weights = [0x00007fff, 0x0000];
   sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
 });
 

ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf

@@ -211,6 +211,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         bf_weights = [0x00007fff, 0x00007fff];
          #clock_src = "external";
          sf_extension = 0 
          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"

ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf

@@ -2,6 +2,8 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
+
 gNBs =
 (
  {
@@ -21,8 +23,7 @@ gNBs =
 
     sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
-    beam_weights = [0]; // single SSB -> one analog beam
-
+	
     servingCellConfigCommon = (
     {
  #spCellConfigCommon
@@ -176,9 +177,6 @@ MACRLCs = ({
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
-  set_analog_beamforming      = 1;
-  beam_duration               = 1;
-  beams_per_period            = 1;
 });
 
 L1s = (

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -203,6 +203,8 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
          clock_src = "internal";
     }
 );

ci-scripts/conf_files/gnb.sa.band66.ntn.25prb.rfsim.conf

@@ -216,6 +216,14 @@ RUs = (
          max_rxgain                    = 114;
          sf_extension                  = 0;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sdr_addrs = "type=x300";
          clock_src = "internal";
          # if_freq = 3700000000L;

ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -203,6 +203,14 @@ RUs = (
          max_rxgain                    = 114;
          sf_extension                  = 0;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sdr_addrs = "type=x300";
          clock_src = "internal";
          # if_freq = 3700000000L;

ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 usrp-tx-thread-config = 1;
 tune-offset = 30720000;
 
@@ -20,6 +21,7 @@ gNBs =
 
     ////////// Physical parameters:
 
+    ssb_SubcarrierOffset  = 0;
     pdsch_AntennaPorts_XP = 2;
     pusch_AntennaPorts    = 2;
     do_CSIRS              = 1;
@@ -33,9 +35,9 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4100.16 MHz
+      # this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
       absoluteFrequencySSB                                             = 673344;
-      # this is 4071 MHz
+      # this is 3300.60 MHz
       dl_absoluteFrequencyPointA                                       = 671400;
       dl_frequencyBand                                                 = 77;
       #scs-SpecificCarrierList
@@ -210,6 +212,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain     = 75;
   eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
   #clock_src = "internal";
   sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
 

ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf

@@ -13,6 +13,7 @@ gNBs =
     tracking_area_code  =  1;
     plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
 
+    //nr_cellid = 12345678L;
     nr_cellid = 1;
 
     ////////// Physical parameters:
@@ -22,7 +23,7 @@ gNBs =
     maxMIMO_layers        = 2;
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
-    do_SRS                = 0;
+    do_SRS                = 0 ;
 
     pdcch_ConfigSIB1 = (
       {
@@ -37,11 +38,10 @@ gNBs =
       physCellId                                                    = 0;
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # center frequency = 3999.36 MHz
-      # selected SSB frequency = 3999.36 MHz
+      # this is 3450.72 MHz (center frequency)
       absoluteFrequencySSB                                          = 666624;
       dl_frequencyBand                                              = 77;
-      # frequency point A = 3950.22 MHz
+      # this is 3401.58 MHz
       dl_absoluteFrequencyPointA                                    = 663348;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
@@ -152,7 +152,7 @@ gNBs =
       nrofUplinkSlots                                               = 1;
       nrofUplinkSymbols                                             = 4;
 
-  ssPBCH_BlockPower                                                 = -10;
+  ssPBCH_BlockPower                                                 = 0;
   }
 
   );
@@ -186,8 +186,8 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 180;
   pucch_TargetSNRx10          = 230;
-  ul_bler_target_upper        = .35;
-  ul_bler_target_lower        = .15;
+  ul_bler_target_upper=.35;
+  ul_bler_target_lower=.15;
   pusch_FailureThres          = 100;
 }
 );
@@ -211,7 +211,7 @@ RUs = (
   local_rf       = "no";
   nb_tx          = 4;
   nb_rx          = 4;
-  att_tx         = 0;
+  att_tx         = 0
   att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
@@ -220,11 +220,23 @@ RUs = (
   eNB_instances  = [0];
   ru_thread_core = 5;
   sl_ahead       = 5;
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
+  clock_src = "internal";
   tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
+  do_precoding = 0; # needs to match O-RU configuration
 }
 );
 
+rfsimulator :
+{
+  serveraddr = "server";
+  serverport = "4043";
+  options = (); #("saviq"); or/and "chanmod"
+  modelname = "AWGN";
+  IQfile = "/tmp/rfsimulator.iqs";
+};
+
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
@@ -242,8 +254,7 @@ security = {
   drb_integrity = "no";
 };
 
-log_config :
-{
+log_config : {
   global_log_level = "info";
   hw_log_level     = "info";
   phy_log_level    = "info";
@@ -260,16 +271,25 @@ fhi_72 = {
   system_core = 0;
   io_core = 1;
   worker_cores = (2);
+  du_addr = ("76:76:64:6e:00:01", "76:76:64:6e:00:01");
   ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
-  mtu = 9600;
+  mtu = 9216; # check if xran uses this properly
   fh_config = ({
-    T1a_cp_dl = (285, 470);
-    T1a_cp_ul = (285, 429);
-    T1a_up = (125, 350);
-    Ta4 = (110, 180);
+    Tadv_cp_dl = 125;
+    T2a_cp_dl = (285, 429); # (min, max)
+    T2a_cp_ul = (285, 429); # (min, max)
+    T2a_up = (125, 428); # (min, max)
+    Ta3 = (130, 170); # (min, max)
+    T1a_cp_dl = (285, 470); # (min, max)
+    T1a_cp_ul = (285, 429); # (min, max)
+    T1a_up = (125, 350); # (min, max)
+    Ta4 = (110, 180); # (min, max)
     ru_config = {
       iq_width = 9;
       iq_width_prach = 9;
     };
+    prach_config = {
+      eAxC_offset = 4;
+    };
   });
 };

ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf

@@ -2,6 +2,7 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
+sa = 1;
 usrp-tx-thread-config = 1;
 
 gNBs = (
@@ -22,6 +23,7 @@ gNBs = (
   pusch_AntennaPorts    = 2;
   do_CSIRS              = 1;
   do_SRS                = 1;
+  ul_prbblacklist       = "135,136,137,138"
 
   servingCellConfigCommon = (
   {
@@ -31,10 +33,10 @@ gNBs = (
 
     # downlinkConfigCommon
       # frequencyInfoDL
-      # this is 4100.16 MHz
+      # this is 3900.60 MHz + (134 PRBs + 4 SCs)@30kHz SCS (GSCN: 8158)
       absoluteFrequencySSB                  = 673344;
       dl_frequencyBand                      = 77;
-      # this is 4051.02 MHz
+      # this is 3900.60 MHz
       dl_absoluteFrequencyPointA            = 670068;
 
       # scs-SpecificCarrierList
@@ -175,8 +177,8 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 270;
-  pucch_TargetSNRx10          = 270;
+  pusch_TargetSNRx10          = 200;
+  pucch_TargetSNRx10          = 200;
   pusch_FailureThres          = 1000;
   ulsch_max_frame_inactivity  = 0;
   ul_max_mcs                  = 25;
@@ -198,12 +200,14 @@ RUs = (
   local_rf       = "yes"
   nb_tx          = 2;
   nb_rx          = 2;
-  att_tx         = 15;
+  att_tx         = 12;
   att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 71;
+  max_rxgain                    = 72;
   eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
   #clock_src = "internal";
   sdr_addrs = "addr=192.168.80.53,clock_source=internal,time_source=internal"
 }

ci-scripts/conf_files/gnb.sa.band78.106prb.l2sim.conf

@@ -1,31 +1,23 @@
-Active_gNBs = ( "gNB-OAI");
+Active_gNBs = ( "gnb-l2sim-vnf");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-usrp-tx-thread-config = 1;
-tune-offset = 30720000;
-
 gNBs =
 (
  {
     ////////// Identification parameters:
     gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
+    gNB_name  =  "gnb-l2sim-vnf";
 
     // 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; }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
 
     nr_cellid = 12345678L;
 
     ////////// Physical parameters:
 
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 4;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 1;
+    min_rxtxtime = 6;
 
     servingCellConfigCommon = (
     {
@@ -35,45 +27,44 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 4100.16 MHz
-      absoluteFrequencySSB                                             = 673344;
-      # this is 4071 MHz
-      dl_absoluteFrequencyPointA                                       = 671400;
-      dl_frequencyBand                                                 = 77;
+      # 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                                            = 162;
+        dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                                        = 31624;
-       #
+        # 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;
+        initialDLBWPsubcarrierSpacing                                   = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
+        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPsearchSpaceZero                                     = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
-      ul_frequencyBand                                                 = 77;
+      ul_frequencyBand                                              = 78;
       #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
+      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 162;
+      ul_subcarrierSpacing                                          = 1;
+      ul_carrierBandwidth                                           = 106;
       pMax                                                          = 20;
      #initialUplinkBWP
-     #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
+      #genericParameters
+        initialULBWPlocationAndBandwidth                            = 12952;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
+        initialULBWPsubcarrierSpacing                               = 1;
       #rach-ConfigCommon
         #rach-ConfigGeneric
           prach_ConfigurationIndex                                  = 98;
@@ -81,7 +72,7 @@ gNBs =
 #0 = one, 1=two, 2=four, 3=eight
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
+          zeroCorrelationZoneConfig                                 = 13;
           preambleReceivedTargetPower                               = -96;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
           preambleTransMax                                          = 6;
@@ -93,9 +84,9 @@ gNBs =
         ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
 #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
+        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
 #ra_ContentionResolutionTimer
 #(0..7) 8,16,24,32,40,48,56,64
         ra_ContentionResolutionTimer                                = 7;
@@ -119,7 +110,7 @@ gNBs =
 # 0 = neither, 1= group hopping, 2=sequence hopping
         pucchGroupHopping                                           = 0;
         hoppingId                                                   = 40;
-        p0_nominal                                                  = -70;
+        p0_nominal                                                  = -90;
 
       ssb_PositionsInBurst_Bitmap                                   = 1;
 
@@ -143,13 +134,13 @@ gNBs =
       # pattern1
       # dl_UL_TransmissionPeriodicity
       # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
       nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
+      nrofUplinkSlots                                               = 2;
       nrofUplinkSymbols                                             = 4;
 
-  ssPBCH_BlockPower                                             = -25;
+      ssPBCH_BlockPower                                             = -25;
   }
 
   );
@@ -165,85 +156,58 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.61.132"; });
+    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.128";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.128";
+        GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
 
   }
 );
 
 MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 250;
-  pusch_FailureThres          = 100;
-  ul_max_mcs		      = 28;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pusch_dtx_threshold = 20;
-  max_ldpc_iterations = 10;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain     = 75;
-  eNB_instances  = [0];
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000, 0x00007fff, 0x0000];
-  #clock_src = "internal";
-  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
-
-}
+        {
+        num_cc = 1;
+        remote_s_address = "127.0.0.1"; // pnf addr [!]
+        local_s_address  = "127.0.0.2"; // vnf addr
+        local_s_portc    = 50601; // vnf p5 port
+        remote_s_portc   = 50600; // pnf p5 port [!]
+        local_s_portd    = 50611; // vnf p7 port [!]
+        remote_s_portd   = 50610; // pnf p7 port [!]
+        tr_s_preference = "nfapi";
+        tr_n_preference = "local_RRC";
+        }
 );
 
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea1", "nea0" );
+  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 = ( "nia1", "nia0" );
+  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 = "yes";
+  drb_integrity = "no";
 };
 
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
+     log_config :
+     {
+       global_log_level                      ="info";
+       hw_log_level                          ="info";
+       phy_log_level                         ="info";
+       mac_log_level                         ="info";
+       rlc_log_level                         ="info";
+       pdcp_log_level                        ="info";
+       rrc_log_level                         ="info";
+       ngap_log_level                         ="debug";
+    };

ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf

@@ -211,6 +211,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 65;
   eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
   sf_extension = 0
   sdr_addrs = "addr=192.168.80.52,clock_source=internal,time_source=internal"
 }

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf

@@ -205,6 +205,14 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sf_extension = 0
          sdr_addrs = "serial=XXXXXXX"
     }

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf

@@ -1,239 +0,0 @@
-Active_gNBs = ( "gnb-rfsim");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-    gNB_name  =  "gnb-rfsim";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
-
-    nr_cellid = 12345678L
-
-    ////////// Physical parameters:
-
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
-#spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-      #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                          = 621312;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                    = 620040;
-      #scs-SpecificCarrierList
-      dl_offstToCarrier                                             = 0;
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      dl_subcarrierSpacing                                          = 1;
-      dl_carrierBandwidth                                           = 106;
-      #initialDownlinkBWP
-      #genericParameters
-      # this is RBstart=0,L=106 (275*(L-1))+RBstart
-      initialDLBWPlocationAndBandwidth                              = 28875;
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      initialDLBWPsubcarrierSpacing                                 = 1;
-      #pdcch-ConfigCommon
-      initialDLBWPcontrolResourceSetZero                            = 11;
-      initialDLBWPsearchSpaceZero                                   = 0;
-
-#  uplinkConfigCommon
-      #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 20;
-      #initialUplinkBWP
-      #genericParameters
-      initialULBWPlocationAndBandwidth                              = 28875;
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      initialULBWPsubcarrierSpacing                                 = 1;
-      #rach-ConfigCommon
-      #rach-ConfigGeneric
-      prach_ConfigurationIndex                                      = 98;
-      #prach_msg1_FDM
-      #0 = one, 1=two, 2=four, 3=eight
-      prach_msg1_FDM                                                = 0;
-      prach_msg1_FrequencyStart                                     = 0;
-      zeroCorrelationZoneConfig                                     = 12;
-      preambleReceivedTargetPower                                   = -104;
-      #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-      preambleTransMax                                              = 6;
-      #powerRampingStep
-      # 0=dB0,1=dB2,2=dB4,3=dB6
-      powerRampingStep                                              = 1;
-      #ra_ReponseWindow
-      #1,2,4,8,10,20,40,80
-      ra_ResponseWindow                                             = 4;
-      #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-      #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-      ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                  = 3;
-      #oneHalf (0..15) 4,8,12,16,...60,64
-      ssb_perRACH_OccasionAndCB_PreamblesPerSSB                     = 15;
-      #ra_ContentionResolutionTimer
-      #(0..7) 8,16,24,32,40,48,56,64
-      ra_ContentionResolutionTimer                                  = 7;
-      rsrp_ThresholdSSB                                             = 19;
-      #prach-RootSequenceIndex_PR
-      #1 = 839, 2 = 139
-      prach_RootSequenceIndex_PR                                    = 2;
-      prach_RootSequenceIndex                                       = 1;
-      # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-      #
-      msg1_SubcarrierSpacing                                        = 1,
-      # restrictedSetConfig
-      # 0=unrestricted, 1=restricted type A, 2=restricted type B
-      restrictedSetConfig                                           = 0,
-
-      msg3_DeltaPreamble                                            = 1;
-      p0_NominalWithGrant                                           = -90;
-
-      # pucch-ConfigCommon setup :
-      # pucchGroupHopping
-      # 0 = neither, 1= group hopping, 2=sequence hopping
-      pucchGroupHopping                                             = 0;
-      hoppingId                                                     = 40;
-      p0_nominal                                                    = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-      # ssb_periodicityServingCell
-      # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-      # dmrs_TypeA_position
-      # 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-      #tdd-UL-DL-ConfigurationCommon
-      # subcarrierSpacing
-      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-    });
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.70.132"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.151";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.151";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc             = 1;
-    tr_s_preference    = "local_L1";
-    tr_n_preference    = "local_RRC";
-    pusch_TargetSNRx10 = 200;
-    pucch_TargetSNRx10 = 200;
-  }
-);
-
-L1s = (
-{
-  num_cc                = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 200;
-#  pucch0_dtx_threshold = 150;
-}
-);
-
-RUs = (
-    {
-       local_rf                      = "yes";
-       nb_tx                         = 1;
-       nb_rx                         = 1;
-       att_tx                        = 0;
-       att_rx                        = 0;
-       bands                         = [78];
-       max_pdschReferenceSignalPower = -27;
-       max_rxgain                    = 75;
-       eNB_instances                 = [0];
-       sf_extension                  = 0;
-       sdr_addrs                     = "serial=XXXXXXX";
-    }
-);
-
-rfsimulator: {
-    serveraddr = "server";
-};
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering        = "yes";
-  drb_integrity        = "no";
-};
-
-log_config : {
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  f1ap_log_level                        ="info";
-};
-
-e2_agent = {
-  near_ric_ip_addr = "192.168.70.150";
-  #sm_dir = "/path/where/the/SMs/are/located/"
-  sm_dir = "/usr/local/lib/flexric/"
-};

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -266,6 +266,8 @@ RUs = ({
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   clock_src = "internal";
 });
 

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml

@@ -1,200 +0,0 @@
-Active_gNBs:
- - gnb-rfsim
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity: none
-gNBs:
-    ##### Identification parameters:
-  - gNB_ID: 0xe00
-    gNB_name: gnb-rfsim
-    tracking_area_code: 1
-    plmn_list:
-      - mcc: 208
-        mnc: 99
-        mnc_length: 2
-        snssaiList:
-          - sst: 1
-            sd: 0xffffff
-    nr_cellid: 12345678
-    ##### Physical parameters:
-    min_rxtxtime: 6
-    servingCellConfigCommon:
-      #spCellConfigCommon
-      - physCellId: 0
-      #  downlinkConfigCommon
-      #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-        absoluteFrequencySSB: 621312
-        # this is 3300.60 MHz
-        dl_absoluteFrequencyPointA: 620040
-        #scs-SpecificCarrierList
-        dl_offstToCarrier: 0
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing: 1
-        dl_carrierBandwidth: 106
-        #initialDownlinkBWP
-        #genericParameters
-        # this is RBstart=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth: 28875
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing: 1
-        #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero: 11
-        initialDLBWPsearchSpaceZero: 0
-        #uplinkConfigCommon
-        #frequencyInfoUL
-        ul_frequencyBand: 78
-        #scs-SpecificCarrierList
-        ul_offstToCarrier: 0
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        ul_subcarrierSpacing: 1
-        ul_carrierBandwidth: 106
-        pMax: 20
-        #initialUplinkBWP
-        #genericParameters
-        initialULBWPlocationAndBandwidth: 28875
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing: 1
-        #rach-ConfigCommon
-        #rach-ConfigGeneric
-        prach_ConfigurationIndex: 98
-        #prach_msg1_FDM
-        #0 = one, 1=two, 2=four, 3=eight
-        prach_msg1_FDM: 0
-        prach_msg1_FrequencyStart: 0
-        zeroCorrelationZoneConfig: 12
-        preambleReceivedTargetPower: -104
-        #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-        preambleTransMax: 6
-        #powerRampingStep
-        # 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep: 1
-        #ra_ReponseWindow
-        #1,2,4,8,10,20,40,80
-        ra_ResponseWindow: 5
-        #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-        #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR: 3
-        #oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB: 15
-        #ra_ContentionResolutionTimer
-        #(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer: 7
-        rsrp_ThresholdSSB: 19
-        #prach-RootSequenceIndex_PR
-        #1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR: 2
-        prach_RootSequenceIndex: 1
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        msg1_SubcarrierSpacing: 1
-        # restrictedSetConfig
-        # 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig: 0
-        msg3_DeltaPreamble: 1
-        p0_NominalWithGrant: -90
-
-        # pucch-ConfigCommon setup :
-        # pucchGroupHopping
-        # 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping: 0
-        hoppingId: 40
-        p0_nominal: -90
-        ssb_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:
-      SCTP_INSTREAMS: 2
-      SCTP_OUTSTREAMS: 2
-
-    ##### AMF parameters:
-    amf_ip_address:
-      - ipv4: 192.168.71.132
-
-    NETWORK_INTERFACES:
-      GNB_IPV4_ADDRESS_FOR_NG_AMF: 192.168.71.140
-      GNB_IPV4_ADDRESS_FOR_NGU: 192.168.71.140
-      GNB_PORT_FOR_S1U: 2152 # Spec 2152
-
-
-MACRLCs:
-  - num_cc: 1
-    tr_s_preference: local_L1
-    tr_n_preference: local_RRC
-    pusch_TargetSNRx10: 200
-    pucch_TargetSNRx10: 200
-
-L1s:
-  - num_cc: 1
-    tr_n_preference:  local_mac
-    prach_dtx_threshold: 200
-    # pucch0_dtx_threshold = 150;
-
-RUs:
-  - local_rf: yes
-    nb_tx: 1
-    nb_rx: 1
-    att_tx: 0
-    att_rx: 0
-    bands: [78]
-    max_pdschReferenceSignalPower: -27
-    max_rxgain: 75
-    eNB_instances: [0]
-    sf_extension: 0
-    sdr_addrs: serial=XXXXXXX
-
-rfsimulator:
-  serveraddr: server
-
-security:
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms: [nea0]
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms: [nia2, nia0]
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering: yes
-  drb_integrity: no
-
-log_config:
-  global_log_level: info
-  hw_log_level: info
-  phy_log_level: info
-  mac_log_level: info
-  rlc_log_level: info
-  pdcp_log_level: info
-  rrc_log_level: info
-  ngap_log_level: debug
-  f1ap_log_level: debug

ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf

@@ -204,6 +204,14 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 68;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sf_extension = 0
          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"
     }

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf

@@ -175,6 +175,7 @@ MACRLCs = (
   pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
+  ul_max_mcs                  = 9;
 }
 );
 
@@ -199,6 +200,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   clock_src = "internal";
 }
 );

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf

@@ -217,6 +217,14 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 68;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sf_extension = 0
          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"
          sl_ahead = 5;

ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf

@@ -218,6 +218,14 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sf_extension = 0
          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"
     }

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -203,6 +203,8 @@ RUs = (
   max_rxgain                    = 114;
   sf_extension                  = 0;
   eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   clock_src = "internal";
 }
 );

ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf

@@ -22,9 +22,9 @@ gNBs =
     maxMIMO_layers        = 2;
     pusch_AntennaPorts    = 4;
     do_CSIRS              = 1;
-    do_SRS                = 0;
-    sib1_tda			        = 15;
-   # force_UL256qam_off    = 1;
+    do_SRS                = 0 ;
+    sib1_tda			  = 15;
+#    force_UL256qam_off    = 1;
 
     pdcch_ConfigSIB1 = (
       {
@@ -41,11 +41,10 @@ gNBs =
      # n_TimingAdvanceOffset                                         = 0;
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
+      # this is 3450.72 MHz (center frequency)
       absoluteFrequencySSB                                          = 623328;
       dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
+      # this is 3401.58 MHz
       dl_absoluteFrequencyPointA                                    = 620052;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
@@ -190,10 +189,10 @@ MACRLCs = (
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 100;
   pucch_TargetSNRx10          = 200;
-  dl_bler_target_upper        = .35;
-  dl_bler_target_lower        = .15;
-  ul_bler_target_upper        = .35;
-  ul_bler_target_lower        = .15;
+  dl_bler_target_upper=.35;
+  dl_bler_target_lower=.15;
+  ul_bler_target_upper=.35;
+  ul_bler_target_lower=.15;
   pusch_FailureThres          = 1000;
   ul_max_mcs                  = 28;
 }
@@ -219,7 +218,7 @@ RUs = (
   local_rf       = "no";
   nb_tx          = 4;
   nb_rx          = 4;
-  att_tx         = 0;
+  att_tx         = 0
   att_rx         = 0;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
@@ -228,8 +227,10 @@ RUs = (
   eNB_instances  = [0];
   ru_thread_core = 5;
   sl_ahead       = 10;
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
   tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
+  do_precoding = 0; # needs to match O-RU configuration
 }
 );
 
@@ -252,15 +253,15 @@ security = {
 
 log_config :
 {
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
+  global_log_level                      ="info";
+  hw_log_level                          ="info";
+  phy_log_level                         ="info";
+  mac_log_level                         ="info";
+  rlc_log_level                         ="info";
+  pdcp_log_level                        ="info";
+  rrc_log_level                         ="info";
+  ngap_log_level                        ="info";
+  f1ap_log_level                        ="info";
 };
 
 fhi_72 = {
@@ -268,9 +269,16 @@ fhi_72 = {
   system_core = 0;
   io_core = 1;
   worker_cores = (2);
+  du_addr = ("00:11:22:33:44:66", "00:11:22:33:44:67");
   ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9600;
+  mtu = 9216;
+  file_prefix = "fhi_72";
   fh_config = ({
+    Tadv_cp_dl = 125;
+    T2a_cp_dl = (259, 500);
+    T2a_cp_ul = (25, 500);
+    T2a_up = (134, 375);
+    Ta3 = (152, 160);
     T1a_cp_dl = (419, 470);
     T1a_cp_ul = (285, 336);
     T1a_up = (294, 345);
@@ -279,5 +287,8 @@ fhi_72 = {
       iq_width = 9;
       iq_width_prach = 9;
     };
+    prach_config = {
+      eAxC_offset = 4;
+    };
   });
 };

ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf

@@ -199,6 +199,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 75;
   eNB_instances  = [0];
+  ##beamforming 1x2 matrix: 1 layer x 2 antennas
+  bf_weights = [0x00007fff, 0x0000];
   #clock_src = "internal";
   sdr_addrs = "mgmt_addr=192.168.10.2,addr=192.168.10.2,clock_source=internal,time_source=internal"
 }

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf

@@ -1,264 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-n78_20");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-#device :{
-# name = "aw2sori_transpro";
-#}
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-
-    gNB_name  =  "gNB-Eurecom-n78_20";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
-
-    nr_cellid = 12345678L
-
-    ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 2;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3469.44 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 631296;
-      dl_frequencyBand                                                 = 78;
-      # this is 3469.44 - (51*12*30e-3/2) = 3460.26 MHz
-      dl_absoluteFrequencyPointA                                       = 630684;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=0,L=50 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 11; # this means shift of 14, so Coreset is in PRBs 1..48, SSB starts at PRB 15
-        initialDLBWPsearchSpaceZero                                             = 0;
-      #pdsch-ConfigCommon
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 100;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 15;
-          preambleReceivedTargetPower                               = -104;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 2;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                             = -10;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.100"; });
-
-    NETWORK_INTERFACES :
-    {
-
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.124/20";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.124/20";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-  {
-    num_cc           = 1;
-    tr_s_preference  = "local_L1";
-    tr_n_preference  = "local_RRC";
-    pusch_TargetSNRx10 = 200;
-    pucch_TargetSNRx10 = 200;
-  }
-);
-
-L1s = (
-        {
-        num_cc = 1;
-        tr_n_preference = "local_mac";
-        prach_dtx_threshold = 120;
-        pucch0_dtx_threshold = 50;
-        pusch_dtx_threshold = 10;
-        }
-);
-
-RUs = (
-    {
-        local_if_name  = "ens7f3";
-        remote_address = "192.168.80.239";
-        local_address  = "192.168.80.24";
-        local_portc    = 50000;
-        remote_portc   = 55444;
-        local_portd    = 52001;
-        remote_portd   = 52183;
-        local_rf       = "no"
-        tr_preference  = "udp_ecpri_if5"
-        nb_tx          = 2
-        nb_rx          = 2
-        att_tx         = 18
-        att_rx         = 0;
-        num_tp_cores   = 4;
-        rxfh_core_id   = 9;
-        txfh_core_id   = 10;
-        tp_cores       = [11,12,13,14];
-        nr_flag        = 1;
-        eNB_instances  = [0];
-        bands          = [78];
-        sl_ahead       = 5;
-    }
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "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 = "yes";
-};
-
-     log_config :
-     {
-       global_log_level                      ="info";
-       global_log_verbosity                  ="medium";
-       hw_log_level                          ="info";
-       hw_log_verbosity                      ="medium";
-       phy_log_level                         ="info";
-       phy_log_verbosity                     ="medium";
-       mac_log_level                         ="info";
-       mac_log_verbosity                     ="high";
-       rlc_log_level                         ="info";
-       rlc_log_verbosity                     ="medium";
-       pdcp_log_level                        ="info";
-       pdcp_log_verbosity                    ="medium";
-       rrc_log_level                         ="info";
-       rrc_log_verbosity                     ="medium";
-       f1ap_log_level                         ="debug";
-       f1ap_log_verbosity                     ="medium";
-       ngap_log_level                         ="debug";
-       ngap_log_verbosity                     ="medium";
-    };
-

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -21,10 +21,10 @@ gNBs =
     nr_cellid = 12345678L
 
     ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 1;
-    pusch_AntennaPorts                                        = 1;
+    pdsch_AntennaPorts_XP                                     = 2;
+    pusch_AntennaPorts                                        = 2;
     do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
+    do_SRS                                                    = 1;
 
     servingCellConfigCommon = (
     {
@@ -34,11 +34,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3469.44 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 631296;
+      # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
+      absoluteFrequencySSB                                             = 630048;
       dl_frequencyBand                                                 = 78;
-      # this is 3469.44 - (51*12*30e-3/2) = 3460.26 MHz
-      dl_absoluteFrequencyPointA                                       = 630684;
+      # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
+      dl_absoluteFrequencyPointA                                       = 629436;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -207,8 +207,8 @@ RUs = (
         remote_portd   = 52183;
         local_rf       = "no"
         tr_preference  = "udp_ecpri_if5"
-        nb_tx          = 1
-        nb_rx          = 1
+        nb_tx          = 2
+        nb_rx          = 2
         att_tx         = 18
         att_rx         = 0;
         num_tp_cores   = 4;
@@ -219,6 +219,14 @@ RUs = (
         eNB_instances  = [0];
         bands          = [78];
         sl_ahead       = 5;
+        ##beamforming 1x2 matrix: 1 layer x 2 antennas
+        bf_weights = [0x00007fff, 0x0000];
+        ##beamforming 1x4 matrix: 1 layer x 4 antennas
+        #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+        ## beamforming 2x2 matrix:
+        # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+        ## beamforming 4x4 matrix:
+        #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
     }
 );
 

ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf

@@ -199,6 +199,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   clock_src = "internal";
 }
 );

ci-scripts/conf_files/nrue.uicc.conf

@@ -6,8 +6,6 @@ uicc0 = {
   nssai_sst=1;
 }
 
-thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/nrue.uicc.yaml

@@ -5,13 +5,11 @@ uicc0:
   dnn: oai
   nssai_sst: 1
 
-thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
 channelmod:
-  max_chan: 10
+  max_chan: 10;
   modellist: modellist_rfsimu_1
   modellist_rfsimu_1:
     - model_name: rfsimu_channel_enB0

ci-scripts/conf_files/ue.sa.conf

@@ -6,5 +6,3 @@ uicc0 = {
   nssai_sst=1;
   nssai_sd=66051;
 }
-
-thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"

ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf

@@ -217,6 +217,15 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+
          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"
     }
 );  

ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf

@@ -1,6 +1,7 @@
 Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
+Num_Threads_PUSCH = 8;
 
 gNBs =
 (
@@ -212,6 +213,15 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+
          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"
     }
 );  

ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -221,6 +221,14 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         ##beamforming 1x2 matrix: 1 layer x 2 antennas
+         bf_weights = [0x00007fff, 0x0000];
+         ##beamforming 1x4 matrix: 1 layer x 4 antennas
+         #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+         ## beamforming 2x2 matrix:
+         # bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+         ## beamforming 4x4 matrix:
+         #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
          sf_extension = 0
          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"
     }

ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -203,6 +203,8 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 75;
          eNB_instances  = [0];
+         #beamforming 1x4 matrix:
+         bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
          clock_src = "internal";
     }
 );

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -201,6 +201,8 @@ RUs = (
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;
   eNB_instances  = [0];
+  #beamforming 1x4 matrix:
+  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   clock_src = "internal";
 }
 );

ci-scripts/datalog_rt_stats.default.yaml

@@ -11,10 +11,10 @@ Ref :
   feptx_prec : 13.0
   feptx_ofdm : 33.0
   feptx_total : 55.0
-  L1 Tx processing : 200.0
-  DLSCH encoding : 100.0
-  L1 Rx processing : 330.0
-  PUSCH inner-receiver : 120.0
+  L1 Tx processing : 220.0
+  DLSCH encoding : 130.0
+  L1 Rx processing : 387.0
+  PUSCH inner-receiver : 150.0
   Schedule Response : 3.0
   DL & UL scheduling timing : 6.0
   UL Indication : 3.0

ci-scripts/epc.py

@@ -38,6 +38,8 @@ import os
 import time
 import signal
 
+from multiprocessing import Process, Lock, SimpleQueue
+
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------

ci-scripts/main.py

@@ -39,12 +39,14 @@ import constants as CONST
 
 
 import cls_oaicitest		 #main class for OAI CI test framework
+import cls_physim		 #class PhySim for physical simulators build and test
 import cls_containerize	 #class Containerize for all container-based operations on RAN/UE objects
 import cls_static_code_analysis  #class for static code analysis
 import cls_physim1		 #class PhySim for physical simulators deploy and run
 import cls_cluster		 # class for building/deploying on cluster
 import cls_native        # class for all native/source-based operations
 
+import sshconnection 
 import epc
 import ran
 import cls_oai_html
@@ -55,13 +57,17 @@ import cls_oai_html
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
+import pexpect	# pexpect
 import time		# sleep
 import os
 import subprocess
 import xml.etree.ElementTree as ET
 import logging
+import datetime
 import signal
+import subprocess
 import traceback
+from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
 	stream=sys.stdout,
@@ -85,6 +91,7 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp
 
+
 #assigning parameters to object instance attributes (even if the attributes do not exist !!)
 def AssignParams(params_dict):
 
@@ -92,8 +99,12 @@ def AssignParams(params_dict):
 		setattr(CiTestObj, key, value)
 		setattr(RAN, key, value)
 		setattr(HTML, key, value)
+		setattr(ldpc, key, value)
+
+
 
 def ExecuteActionWithParam(action):
+	global SSH
 	global EPC
 	global RAN
 	global HTML
@@ -101,6 +112,7 @@ def ExecuteActionWithParam(action):
 	global SCA
 	global PHYSIM
 	global CLUSTER
+	global ldpc
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
@@ -149,6 +161,8 @@ def ExecuteActionWithParam(action):
 			success = CONTAINERS.BuildRunTests(HTML)
 
 	elif action == 'Initialize_eNB':
+		RAN.eNB_Trace=test.findtext('eNB_Trace')
+		RAN.eNB_Stats=test.findtext('eNB_Stats')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -281,6 +295,18 @@ def ExecuteActionWithParam(action):
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
 		success = cls_oaicitest.IdleSleep(HTML, int(st))
 
+	elif action == 'Build_PhySim':
+		ldpc.buildargs  = test.findtext('physim_build_args')
+		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
+		if (forced_workspace_cleanup is None):
+			ldpc.forced_workspace_cleanup=False
+		else:
+			if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
+				ldpc.forced_workspace_cleanup=True
+			else:
+				ldpc.forced_workspace_cleanup=False
+		success = ldpc.Build_PhySim(HTML,CONST)
+
 	elif action == 'Deploy_Run_PhySim':
 		success = PHYSIM.Deploy_PhySim(HTML)
 
@@ -349,7 +375,6 @@ def ExecuteActionWithParam(action):
 		string_field = test.findtext('services')
 		if string_field is not None:
 			CONTAINERS.services[CONTAINERS.eNB_instance] = string_field
-		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(HTML)
@@ -358,11 +383,16 @@ def ExecuteActionWithParam(action):
 		elif action == 'Create_Workspace':
 			success = CONTAINERS.Create_Workspace(HTML)
 
-	elif action == 'Run_Physim':
-		physim_options = test.findtext('physim_run_args')
-		physim_test = test.findtext('physim_test')
-		physim_threshold = test.findtext('physim_time_threshold') or 'inf'
-		success = cls_native.Native.Run_Physim(HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, physim_options, physim_test, physim_threshold)
+	elif action == 'Run_CUDATest' or action == 'Run_NRulsimTest' or action == 'Run_T2Test':
+		ldpc.runargs = test.findtext('physim_run_args')
+		ldpc.runsim = test.findtext('physim_run')
+		ldpc.timethrs = test.findtext('physim_time_threshold')
+		if action == 'Run_CUDATest':
+			success = ldpc.Run_CUDATest(HTML,CONST,id)
+		elif action == 'Run_NRulsimTest':
+			success = ldpc.Run_NRulsimTest(HTML,CONST,id)
+		elif action == 'Run_T2Test':
+			success = ldpc.Run_T2Test(HTML,CONST,id)
 
 	elif action == 'LicenceAndFormattingCheck':
 		success = SCA.LicenceAndFormattingCheck(HTML)
@@ -371,20 +401,26 @@ def ExecuteActionWithParam(action):
 		success = SCA.CppCheckAnalysis(HTML)
 
 	elif action == 'Push_Local_Registry':
-		svr_id = test.findtext('svr_id')
-		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id)
+		string_field = test.findtext('registry_svr_id')
+		if (string_field is not None):
+			CONTAINERS.registrySvrId = string_field
+		success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
 
-	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
-		svr_id = test.findtext('svr_id')
-		images = test.findtext('images').split()
-		# hack: for FlexRIC, we need to overwrite the tag to use
-		tag = None
-		if len(images) == 1 and images[0] == "oai-flexric":
-			tag = CONTAINERS.flexricTag
-		if action == "Pull_Local_Registry":
-			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag)
-		if action == "Clean_Test_Server_Images":
-			success = CONTAINERS.Clean_Test_Server_Images(HTML, svr_id, images, tag=tag)
+	elif action == 'Pull_Local_Registry':
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CONTAINERS.testSvrId = string_field
+		CONTAINERS.imageToPull.clear()
+		string_field = test.findtext('images_to_pull')
+		if (string_field is not None):
+			CONTAINERS.imageToPull = string_field.split()
+		success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+
+	elif action == 'Clean_Test_Server_Images':
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CONTAINERS.testSvrId = string_field
+		success = CONTAINERS.Clean_Test_Server_Images(HTML)
 
 	elif action == 'Custom_Command':
 		node = test.findtext('node')
@@ -399,9 +435,13 @@ def ExecuteActionWithParam(action):
 		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
 
 	elif action == 'Pull_Cluster_Image':
-		images = test.findtext('images').split()
-		node = test.findtext('node')
-		success = CLUSTER.PullClusterImage(HTML, node, images)
+		string_field = test.findtext('images_to_pull')
+		if (string_field is not None):
+			CLUSTER.imageToPull = string_field.split()
+		string_field = test.findtext('test_svr_id')
+		if (string_field is not None):
+			CLUSTER.testSvrId = string_field
+		success = CLUSTER.PullClusterImage(HTML, RAN)
 
 	else:
 		logging.warning(f"unknown action {action}, skip step")
@@ -450,6 +490,7 @@ mode = ''
 
 CiTestObj = cls_oaicitest.OaiCiTest()
  
+SSH = sshconnection.SSHConnection()
 EPC = epc.EPCManagement()
 RAN = ran.RANManagement()
 HTML = cls_oai_html.HTMLManagement()
@@ -458,12 +499,15 @@ SCA = cls_static_code_analysis.StaticCodeAnalysis()
 PHYSIM = cls_physim1.PhySim()
 CLUSTER = cls_cluster.Cluster()
 
+ldpc=cls_physim.PhySim()    #create an instance for LDPC test using GPU or CPU build
+
+
 #-----------------------------------------------------------
 # Parsing Command Line Arguments
 #-----------------------------------------------------------
 
 import args_parse
-py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)
+py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,CONTAINERS,HELP,SCA,PHYSIM,CLUSTER)
 
 
 
@@ -625,7 +669,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	#(6 digits or less than 6 digits followed by +)
 	for test in exclusion_tests:
 		if     (not re.match('^[0-9]{6}$', test) and
-				not re.match('^[0-9]{1,5}\\+$', test)):
+				not re.match('^[0-9]{1,5}\+$', test)):
 			logging.error('exclusion test is invalidly formatted: ' + test)
 			sys.exit(1)
 		else:
@@ -636,7 +680,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	#be verbose
 	for test in requested_tests:
 		if     (re.match('^[0-9]{6}$', test) or
-				re.match('^[0-9]{1,5}\\+$', test)):
+				re.match('^[0-9]{1,5}\+$', test)):
 			logging.info('test group/case requested: ' + test)
 		else:
 			logging.error('requested test is invalidly formatted: ' + test)
@@ -658,6 +702,26 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 
 	HTML.CreateHtmlTabHeader()
 
+	# On CI bench w/ containers, we need to validate if IP routes are set
+	if EPC.IPAddress == '172.21.16.136':
+		CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password)
+	if EPC.IPAddress == '172.21.16.137':
+		CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password)
+	if CONTAINERS.eNBIPAddress == '172.21.16.127':
+		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
+	if CONTAINERS.eNB1IPAddress == '172.21.16.127':
+		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
+	if CONTAINERS.eNBIPAddress == '172.21.16.128':
+		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
+	if CONTAINERS.eNB1IPAddress == '172.21.16.128':
+		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
+	if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot':
+		CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
+	if CONTAINERS.eNBIPAddress == '172.21.16.137':
+		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
+	if CONTAINERS.eNB1IPAddress == '172.21.16.137':
+		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
+
 	task_set_succeeded = True
 	HTML.startTime=int(round(time.time() * 1000))
 

ci-scripts/provideUniqueImageTag.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 import re
 import subprocess
 import sys

ci-scripts/ran.py

@@ -36,6 +36,7 @@ import re               # reg
 import logging
 import os
 import time
+from multiprocessing import Process, Lock, SimpleQueue
 import yaml
 import cls_cmd
 
@@ -89,6 +90,8 @@ class RANManagement():
 		self.runtime_stats= ''
 		self.datalog_rt_stats={}
 		self.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
+		self.eNB_Trace = '' #if 'yes', Tshark will be launched at initialization
+		self.eNB_Stats = '' #if 'yes', Statistics Monitor will be launched at initialization		
 		self.USRPIPAddress = ''
 		#checkers from xml
 		self.ran_checkers={}
@@ -127,6 +130,23 @@ class RANManagement():
 		mySSH = SSH.SSHConnection()
 		cwd = os.getcwd()
 		
+		#Get pcap on enb and/or gnb if enabled in the xml 
+		if self.eNB_Trace=='yes':
+			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+				pcapfile_prefix="enb_"
+			else:
+				pcapfile_prefix="gnb_"
+			mySSH.open(lIpAddr, lUserName, lPassWord)
+			eth_interface = 'any'
+			fltr = 'sctp'
+			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)
+			mySSH.close()
+			
+
+
 		# If tracer options is on, running tshark on EPC side and capture traffic b/ EPC and eNB
 		if EPC.IPAddress != "none":
 			localEpcIpAddr = EPC.IPAddress
@@ -207,6 +227,19 @@ class RANManagement():
 		mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf enb_' + self.testCase_id + '.log', '\$', 5)
 		mySSH.command('echo $USER; nohup sudo -E stdbuf -o0 ./my-lte-softmodem-run' + str(self.eNB_instance) + '.sh > ' + lSourcePath + '/cmake_targets/enb_' + self.testCase_id + '.log 2>&1 &', lUserName, 10)
 
+
+		#stats monitoring during runtime
+		time.sleep(20)
+		monitor_file='../ci-scripts/stats_monitor.py'
+		conf_file='../ci-scripts/stats_monitor_conf.yaml'
+		if self.eNB_Stats=='yes':
+			if self.air_interface[self.eNB_instance] == 'lte-softmodem':
+				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' enb 2>&1 > enb_stats_monitor_execution.log &', '\$', 5)
+			else:
+				mySSH.command('echo $USER; nohup python3 ' + monitor_file + ' ' + conf_file + ' ' + self.testCase_id + ' gnb 2>&1 > gnb_stats_monitor_execution.log &', '\$', 5)
+
+
+
 		self.eNBLogFiles[int(self.eNB_instance)] = 'enb_' + self.testCase_id + '.log'
 		if extra_options != '':
 			self.eNBOptions[int(self.eNB_instance)] = extra_options
@@ -420,6 +453,9 @@ class RANManagement():
 					#debug / tentative
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrL1_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrMAC_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
+					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './gnb_stats_monitor.pickle', self.eNBSourceCodePath + '/cmake_targets/')
+					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './gnb_stats_monitor.png', self.eNBSourceCodePath + '/cmake_targets/')
+					#
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')
 				logging.debug('\u001B[1m Analyzing ' + nodeB_prefix + 'NB logfile \u001B[0m ' + fileToAnalyze)
 				logStatus = self.AnalyzeLogFile_eNB(fileToAnalyze, HTML, self.ran_checkers)

ci-scripts/scripts/create_workspace.sh

@@ -15,7 +15,7 @@ ref=$3
 merge=$4
 
 rm -rf ${dir}
-git clone --filter=blob:none -n ${repo} ${dir}
+git clone --filter=blob:none -n -b develop ${repo} ${dir}
 cd ${dir}
 git config user.email "jenkins@openairinterface.org"
 git config user.name "OAI Jenkins"

ci-scripts/stats_monitor.py

@@ -0,0 +1,139 @@
+"""
+To create graphs and pickle from runtime statistics in L1,MAC,RRC,PDCP files
+"""
+
+import subprocess
+import time
+import shlex
+import re
+import sys
+import pickle
+import matplotlib.pyplot as plt
+import numpy as np
+import yaml
+import os
+
+
+class StatMonitor():
+    def __init__(self,cfg_file):
+        with open(cfg_file,'r') as file:
+            self.d = yaml.load(file)
+        for node in self.d:#so far we have enb or gnb as nodes
+            for metric_l1 in self.d[node]: #first level of metric keys
+                if metric_l1!="graph": #graph is a reserved word to configure graph paging, so it is disregarded
+                    if self.d[node][metric_l1] is None:#first level is None -> create array
+                        self.d[node][metric_l1]=[]
+                    else: #first level is not None -> there is a second level -> create array
+                        for metric_l2 in self.d[node][metric_l1]:
+                            self.d[node][metric_l1][metric_l2]=[]                
+
+
+
+    def process_gnb (self,node_type,output):
+        for line in output:
+            tmp=line.decode("utf-8")
+            result=re.match(r'^.*\bdlsch_rounds\b ([0-9]+)\/([0-9]+).*\bdlsch_errors\b ([0-9]+)',tmp)
+            if result is not None:
+                self.d[node_type]['dlsch_err'].append(int(result.group(3)))
+                percentage=float(result.group(2))/float(result.group(1))
+                self.d[node_type]['dlsch_err_perc_round_1'].append(percentage)
+            result=re.match(r'^.*\bulsch_rounds\b ([0-9]+)\/([0-9]+).*\bulsch_errors\b ([0-9]+)',tmp)
+            if result is not None:
+                self.d[node_type]['ulsch_err'].append(int(result.group(3)))
+                percentage=float(result.group(2))/float(result.group(1))
+                self.d[node_type]['ulsch_err_perc_round_1'].append(percentage)
+
+            for k in self.d[node_type]['rt']:
+                result=re.match(rf'^.*\b{k}\b:\s+([0-9\.]+) us;\s+([0-9]+);\s+([0-9\.]+) us;',tmp)
+                if result is not None:
+                    self.d[node_type]['rt'][k].append(float(result.group(3)))
+
+
+    def process_enb (self,node_type,output):
+        for line in output:
+            tmp=line.decode("utf-8")
+            result=re.match(r'^.*\bPHR\b ([0-9]+).+\bbler\b ([0-9]+\.[0-9]+).+\bmcsoff\b ([0-9]+).+\bmcs\b ([0-9]+)',tmp)
+            if result is not None:
+                self.d[node_type]['PHR'].append(int(result.group(1)))
+                self.d[node_type]['bler'].append(float(result.group(2)))
+                self.d[node_type]['mcsoff'].append(int(result.group(3)))
+                self.d[node_type]['mcs'].append(int(result.group(4)))
+
+
+    def collect(self,testcase_id,node_type):
+        if node_type=='enb':
+            files = ["L1_stats.log", "MAC_stats.log", "PDCP_stats.log", "RRC_stats.log"]
+        else: #'gnb'
+            files = ["nrL1_stats.log", "nrMAC_stats.log", "nrPDCP_stats.log", "nrRRC_stats.log"]
+        #append each file's contents to another file (prepended with CI-) for debug
+        for f in files:
+            if os.path.isfile(f):
+                cmd = 'cat '+ f + ' >> CI-'+testcase_id+'-'+f
+                subprocess.Popen(cmd,shell=True)  
+        #join the files for further processing
+        cmd='cat '
+        for f in files:
+            if os.path.isfile(f):
+                cmd += f+' '
+        process=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
+        output = process.stdout.readlines()
+        if node_type=='enb':
+            self.process_enb(node_type,output)
+        else: #'gnb'
+            self.process_gnb(node_type,output)
+
+
+    def graph(self,testcase_id, node_type):
+        for page in self.d[node_type]['graph']:#work out a set a graphs per page
+            col = 1
+            figure, axis = plt.subplots(len(self.d[node_type]['graph'][page]), col ,figsize=(10, 10))
+            i=0
+            for m in self.d[node_type]['graph'][page]:#metric may refer to 1 level or 2 levels 
+                metric_path=m.split('.')
+                if len(metric_path)==1:#1 level
+                    metric_l1=metric_path[0]
+                    major_ticks = np.arange(0, len(self.d[node_type][metric_l1])+1, 1)
+                    axis[i].set_xticks(major_ticks)
+                    axis[i].set_xticklabels([])
+                    axis[i].plot(self.d[node_type][metric_l1],marker='o')
+                    axis[i].set_xlabel('time')
+                    axis[i].set_ylabel(metric_l1)
+                    axis[i].set_title(metric_l1)
+                    
+                else:#2 levels
+                    metric_l1=metric_path[0]
+                    metric_l2=metric_path[1]
+                    major_ticks = np.arange(0, len(self.d[node_type][metric_l1][metric_l2])+1, 1)
+                    axis[i].set_xticks(major_ticks)
+                    axis[i].set_xticklabels([])
+                    axis[i].plot(self.d[node_type][metric_l1][metric_l2],marker='o')
+                    axis[i].set_xlabel('time')
+                    axis[i].set_ylabel(metric_l2)
+                    axis[i].set_title(metric_l2)
+                i+=1                
+
+            plt.tight_layout()
+            #save as png
+            plt.savefig(node_type+'_stats_monitor_'+testcase_id+'_'+page+'.png')
+
+
+if __name__ == "__main__":
+
+    cfg_filename = sys.argv[1] #yaml file as metrics config
+    testcase_id = sys.argv[2] #test case id to name files accordingly, especially if we have several tests in a sequence
+    node = sys.argv[3]#enb or gnb
+    mon=StatMonitor(cfg_filename)
+
+    #collecting stats when modem process is stopped
+    CMD='ps aux | grep modem | grep -v grep'
+    process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
+    output = process.stdout.readlines()
+    while len(output)!=0 :
+        mon.collect(testcase_id,node)
+        process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
+        output = process.stdout.readlines()
+        time.sleep(1)
+    print('Process stopped')
+    with open(node+'_stats_monitor.pickle', 'wb') as handle:
+        pickle.dump(mon.d, handle, protocol=pickle.HIGHEST_PROTOCOL)
+    mon.graph(testcase_id, node)

ci-scripts/tests/README.md

@@ -3,28 +3,18 @@ scripts.
 
 # Unit test
 
-This repository contains unit tests. To run them, switch to the parent
-directory, i.e., `ci-scripts/`, and run
+There are some unit tests. From the parent directory, i.e., `ci-scripts/`,
+start with
 
-    python3 -m unittest tests/*.py
-
-To run individual unit tests, start them like so:
-
-    python tests/build.py -v
-    python tests/cmd.py -v
     python tests/deployment.py -v
-    python tests/iperf-analysis.py -v
     python tests/ping-iperf.py -v
+    python tests/iperf-analysis.py -v
 
-The logs will indicate if all tests passed. `tests/deployment.py` requires
-these images to be present:
+It will indicate if all tests passed. It assumes that these images are present:
 
 - `oai-ci/oai-nr-ue:develop-12345678`
 - `oai-ci/oai-gnb:develop-12345678`
 
-It will try to download `oaisoftwarealliance/oai-{gnb,nr-ue}:develop`
-automatically and retag the images.
-
 # test-runner test
 
 This is not a true test, because the results need to be manually inspected. To

ci-scripts/tests/build.py

@@ -1,40 +0,0 @@
-import sys
-import logging
-logging.basicConfig(
-	level=logging.DEBUG,
-	stream=sys.stdout,
-	format="[%(asctime)s] %(levelname)8s: %(message)s"
-)
-import unittest
-import tempfile
-
-sys.path.append('./') # to find OAI imports below
-import cls_oai_html
-import cls_containerize
-import cls_cmd
-
-class TestBuild(unittest.TestCase):
-	def setUp(self):
-		self.html = cls_oai_html.HTMLManagement()
-		self.html.testCase_id = "000000"
-		self.cont = cls_containerize.Containerize()
-		self.cont.eNB_serverId[0] = '0'
-		self.cont.eNBIPAddress = 'localhost'
-		self.cont.eNBUserName = None
-		self.cont.eNBPassword = None
-		self._d = tempfile.mkdtemp()
-		logging.warning(f"temporary directory: {self._d}")
-		self.cont.eNBSourceCodePath = self._d
-
-	def tearDown(self):
-		logging.warning(f"removing directory contents")
-		with cls_cmd.getConnection(None) as cmd:
-			cmd.run(f"rm -rf {self._d}")
-
-	def test_build_proxy(self):
-		self.cont.proxyCommit = "b64d9bce986b38ca59e8582864ade3fcdd05c0dc"
-		success = self.cont.BuildProxy(self.html)
-		self.assertTrue(success)
-
-if __name__ == '__main__':
-	unittest.main()

ci-scripts/tests/deployment.py

@@ -15,24 +15,9 @@ import cls_oai_html
 import cls_oaicitest
 import cls_containerize
 import ran
-import cls_cmd
 
 class TestDeploymentMethods(unittest.TestCase):
-	def _pull_image(self, cmd, image):
-		ret = cmd.run(f"docker inspect oai-ci/{image}:develop-12345678")
-		if ret.returncode == 0: # exists
-			return
-		ret = cmd.run(f"docker pull oaisoftwarealliance/{image}:develop")
-		self.assertEqual(ret.returncode, 0)
-		ret = cmd.run(f"docker tag oaisoftwarealliance/{image}:develop oai-ci/{image}:develop-12345678")
-		self.assertEqual(ret.returncode, 0)
-		ret = cmd.run(f"docker rmi oaisoftwarealliance/{image}:develop")
-		self.assertEqual(ret.returncode, 0)
-
 	def setUp(self):
-		with cls_cmd.getConnection("localhost") as cmd:
-			self._pull_image(cmd, "oai-gnb")
-			self._pull_image(cmd, "oai-nr-ue")
 		self.html = cls_oai_html.HTMLManagement()
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
@@ -47,7 +32,6 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.eNBUserName = None
 		self.cont.eNBPassword = None
 		self.cont.eNBSourceCodePath = os.getcwd()
-		self.cont.num_attempts = 3
 
 	def test_deploy(self):
 		self.cont.yamlPath[0] = 'tests/simple-dep/'
@@ -66,15 +50,6 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertFalse(deploy)
 		self.cont.yamlPath = old
 
-	def test_deployfails_2svc(self):
-		# fails reliably
-		old = self.cont.yamlPath
-		self.cont.yamlPath[0] = 'tests/simple-fail-2svc/'
-		deploy = self.cont.DeployObject(self.html)
-		self.cont.UndeployObject(self.html, self.ran)
-		self.assertFalse(deploy)
-		self.cont.yamlPath = old
-
 	def test_deploy_ran(self):
 		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
 		self.cont.services[0] = "oai-gnb"

ci-scripts/tests/pull-clean-int-registry.py

@@ -1,53 +0,0 @@
-import sys
-import logging
-logging.basicConfig(
-	level=logging.DEBUG,
-	stream=sys.stdout,
-	format="[%(asctime)s] %(levelname)8s: %(message)s"
-)
-import os
-os.system(f'rm -rf cmake_targets')
-os.system(f'mkdir -p cmake_targets/log')
-import unittest
-
-sys.path.append('./') # to find OAI imports below
-import cls_oai_html
-import cls_cmd
-import cls_containerize
-
-class TestDeploymentMethods(unittest.TestCase):
-	def setUp(self):
-		self.html = cls_oai_html.HTMLManagement()
-		self.html.testCaseId = "000000"
-		self.cont = cls_containerize.Containerize()
-		self.cont.eNBIPAddress = 'localhost'
-		self.cont.eNBSourceCodePath = os.getcwd()
-
-	def test_pull_clean_local_reg(self):
-		# the pull function has the authentication at the internal cluster hardcoded
-		# this is a refactoring opportunity: we should do it in a separate step
-		# and allow to have pull work with any registry
-		registry = "porcepix.sboai.cs.eurecom.fr"
-		with cls_cmd.getConnection("localhost") as cmd:
-			ret = cmd.run(f"ping -c1 -w1 {registry}")
-			if ret.returncode != 0: # could not ping once -> skip test
-				self.skipTest(f"test_pull_clean_local_reg: could not reach {registry} (run inside sboai)")
-		svr_id = '0'
-		images = ["oai-gnb"]
-		tag = "develop"
-		pull = self.cont.Pull_Image_from_Registry(self.html, svr_id, images, tag=tag)
-		clean = self.cont.Clean_Test_Server_Images(self.html, svr_id, images, tag=tag)
-		self.assertTrue(pull)
-		self.assertTrue(clean)
-
-	def test_pull_clean_docker_hub(self):
-		svr_id = '0'
-		r = "docker.io"
-		images = ["hello-world"]
-		tag = "latest"
-		pull = self.cont.Pull_Image_from_Registry(self.html, svr_id, images, tag=tag, registry=r, username=None, password=None)
-		clean = self.cont.Clean_Test_Server_Images(self.html, svr_id, images, tag=tag)
-		self.assertTrue(pull)
-		self.assertTrue(clean)
-
-if __name__ == '__main__':unittest.main()

ci-scripts/tests/simple-fail-2svc/docker-compose.yml

@@ -1,23 +0,0 @@
-services:
-  test1:
-    image: ubuntu:jammy
-    container_name: test_container1
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "false"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1
-  test2:
-    image: ubuntu:jammy
-    container_name: test_container2
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "sleep infinity"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1

ci-scripts/xml_class_list.yml

@@ -1,7 +1,10 @@
   - Build_Proxy
   - Build_Cluster_Image
   - Pull_Cluster_Image
-  - Run_Physim
+  - Build_PhySim
+  - Run_CUDATest
+  - Run_T2Test
+  - Run_NRulsimTest
   - Build_eNB
   - Initialize_eNB
   - Terminate_eNB