Get handover working for FDD too

CMakeLists.txt

@@ -21,7 +21,7 @@
 
 # Author: laurent THOMAS, Lionel GAUTHIER
 
-cmake_minimum_required (VERSION 3.16)
+cmake_minimum_required (VERSION 3.12)
 project (OpenAirInterface LANGUAGES C CXX)
 
 #########################################################
@@ -180,6 +180,22 @@ add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)"
 if (SANITIZE_ADDRESS)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+  # There seems to be some incompatibility with pthread_create and the RT scheduler, which
+  # results in pthread_create hanging.
+  #
+  # When we switch from Ubuntu 16.04 to 18.04, we found that running with the address sanitizer,
+  # the pthread_create function calls were not working. The inital thought was that we were
+  # trying to create a thread that was not-blocking and would eventually crash the machine during
+  # the run. After more debugging, we found that we would never even start the thread. We narrowed
+  # down the first two instances of pthread_create in the gNB and NR UE to be sctp_eNB_task and
+  # one_thread, respectively. We found that adding sleeps, and various other pauses to the threads
+  # had not effect. From there, we found that if we add an abort(); prior to the thread loop, we
+  # do not execute that. This indicated to us that the problem is not likely to be a non-blocking
+  # thread, but perhaps and issue with pthread_create itself. From there we begain to research the
+  # issue on the web. See: https://github.com/google/sanitizers/issues/1125
+  #
+  # Google searching indicates this appears to be a problem since at least 2018. This could be something
+  # wrong in the pthread library, or something subtly wrong in this CMakeLists.txt. Use Ubuntu 20.04 instead.
 endif ()
 
 add_boolean_option(SANITIZE_THREAD False "enable the address sanitizer (TSan)" ON)
@@ -447,7 +463,7 @@ add_library(f1ap
             ${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 PUBLIC asn1_f1ap)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)
 
 # LPP
@@ -508,6 +524,9 @@ include_directories ("${OPENAIR_DIR}/radio/COMMON")
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
 
+add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????" ON)
+add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????" ON)
+
 add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE" ON)
@@ -631,11 +650,20 @@ add_library(HASHTABLE
 include_directories(${OPENAIR_DIR}/common/utils/hashtable)
 
 add_library(UTIL
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
+  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
   ${OPENAIR2_DIR}/UTIL/OPT/probe.c
+  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
+  ${OPENAIR_DIR}/common/utils/utils.c
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/time_meas.c
+  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
 if (ENABLE_LTTNG)
   find_package(LTTngUST 2.3.8 EXACT REQUIRED)
+  target_sources(UTIL PRIVATE common/utils/LOG/lttng-tp.c)
+  target_link_libraries(UTIL PUBLIC lttng-ust)
 else()
   message(STATUS "LTTNG support disabled")
 endif()
@@ -646,7 +674,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)
+target_link_libraries(UTIL PUBLIC ${T_LIB} pthread)
 
 set(SECURITY_SRC
   ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -720,14 +748,20 @@ target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs
 
 # nFAPI
 #################################
+set(NFAPI_COMMON_SRC
+  ${NFAPI_DIR}/common/src/debug.c
+  )
+add_library(NFAPI_COMMON_LIB ${NFAPI_COMMON_SRC})
+
+include_directories(${NFAPI_DIR}/common/public_inc)
+
 set(NFAPI_SRC
+  ${NFAPI_DIR}/nfapi/src/nfapi.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p4.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p5.c
   ${NFAPI_DIR}/nfapi/src/nfapi_p7.c
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
-target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)
 
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -752,10 +786,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)
-if(OAI_AERIAL)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
-endif()
+
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
 
@@ -1014,7 +1045,6 @@ set(PHY_SRC_UE
   ${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
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
   )
 
@@ -1040,6 +1070,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
   ${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
@@ -1150,14 +1181,9 @@ target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common)
-
-add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
-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)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs)
 
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
@@ -1180,9 +1206,10 @@ set(PHY_MEX_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   )
 add_library(PHY_MEX ${PHY_MEX_UE})
-target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs UTIL)
+target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs)
 
 #Layer 2 library
 #####################
@@ -1384,9 +1411,9 @@ set (MAC_NR_SRC_UE
   ${NR_UE_MAC_DIR}/nr_ue_procedures.c
   ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
-  ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl.c
   ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
   ${NR_UE_MAC_DIR}/nr_ra_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
 )
 
 set (ENB_APP_SRC
@@ -1435,7 +1462,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)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1454,10 +1481,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)
-if(OAI_AERIAL)
-    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
-endif()
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
 if(E2_AGENT)
   target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
   target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1484,11 +1508,15 @@ add_library(L2_UE_LTE_NR
 )
 target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
+if (NOT ${NOS1})
+target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
+endif()
+
 target_link_libraries(L2_UE PRIVATE 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)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_library(MAC_NR_COMMON
             ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1882,6 +1910,28 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
 
+# Qt-based scope
+add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
+if (ENABLE_NRQTSCOPE)
+  find_package(Qt5 REQUIRED COMPONENTS Widgets Charts)
+  message ("Qt5 Widgets and Charts found for nrqtscope")
+  set(QTSCOPE_SOURCE_NR
+    ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp
+    ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c)
+  # Creates rules for calling the Meta-Object Compiler (moc) on the given source files
+  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
+  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
+  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+endif()
+
+add_library(SIMU_ETH STATIC
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
+)
+target_link_libraries(SIMU_ETH PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1898,9 +1948,10 @@ set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODU
 # add executables for operation
 #################################
 add_library(minimal_lib
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
   ${OPENAIR_DIR}/common/utils/minimal_stub.c
   )
-target_link_libraries(minimal_lib PUBLIC pthread dl ${T_LIB} LOG)
+target_link_libraries(minimal_lib pthread dl ${T_LIB})
 
 add_executable(nfapi_test
   ${OPENAIR_DIR}/openair2/NR_PHY_INTERFACE/nfapi_5g_test.c
@@ -1930,6 +1981,8 @@ add_executable(lte-softmodem
   ${OPENAIR_DIR}/executables/create_tasks_mbms.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -1941,8 +1994,8 @@ add_dependencies(lte-softmodem oai_iqplayer)
 target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU shlib_loader
+  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  ${NAS_UE_LIB} ITTI SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
@@ -1986,17 +2039,22 @@ add_executable(lte-uesoftmodem
   ${OPENAIR_DIR}/executables/create_tasks_ue.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
+if (NOT ${NOS1})
+	target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+endif()
 target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
   SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI shlib_loader
   -Wl,--end-group z dl)
 
@@ -2021,17 +2079,22 @@ add_executable(nr-softmodem
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
+include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
+
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
   x2ap f1ap m2ap m3ap e1ap shlib_loader
   -Wl,--end-group z dl)
 
@@ -2039,11 +2102,6 @@ target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
-if (OAI_AERIAL)
-  target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
-  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
-endif()
 if(E2_AGENT)
   target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()
@@ -2062,6 +2120,7 @@ target_link_libraries(nr-softmodem PRIVATE
 add_executable(nr-cuup
   executables/nr-cuup.c
   executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
   ${NR_PDCP_SRC}
@@ -2070,7 +2129,7 @@ add_executable(nr-cuup
 
 target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap f1ap
+                      GTPV1U e1ap f1ap SIMU_ETH
                       z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)
@@ -2089,20 +2148,23 @@ add_executable(nr-uesoftmodem
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
 target_link_libraries(nr-uesoftmodem PRIVATE
   -Wl,--start-group
   nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
   NFAPI_USER_LIB MISC_NFAPI_NR_LIB
-  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU shlib_loader
+  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
 
-target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
+target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2145,6 +2207,7 @@ target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
 add_executable(polartest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(polartest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_COMMON PHY_NR_UE CONFIG_LIB -Wl,--end-group
@@ -2153,6 +2216,7 @@ target_link_libraries(polartest PRIVATE
 
 add_executable(smallblocktest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )
 
 target_link_libraries(smallblocktest PRIVATE
@@ -2178,6 +2242,7 @@ target_link_libraries(ldpctest PRIVATE
 add_executable(nr_dlschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_dlschsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2188,6 +2253,7 @@ target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)
 add_executable(nr_pbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_pbchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2198,14 +2264,16 @@ target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_psbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
   m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2214,6 +2282,7 @@ target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_pucchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   )
 target_link_libraries(nr_pucchsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2224,21 +2293,24 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 add_executable(nr_prachsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )
 target_link_libraries(nr_prachsim PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
@@ -2248,6 +2320,7 @@ target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulschsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_ulschsim PRIVATE
@@ -2259,7 +2332,9 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
@@ -2271,8 +2346,8 @@ if (ENABLE_LDPC_T2)
 endif()
 
 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2319,7 +2394,7 @@ endforeach(myExe)
 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
   foreach(i
-        #all "add_executable" definitions (except tests, updatefw)
+        #all "add_executable" definitions (except tests, rb_tool, updatefw)
         lte-softmodem lte-uesoftmodem nr-softmodem
         nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
         ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
@@ -2330,18 +2405,98 @@ if (${T_TRACER})
         params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
         oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
         SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
-        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
+        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
         MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
-        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)
+        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()
   endforeach(i)
 endif (${T_TRACER})
 
+##################################################
+# Generated specific cases is not regular code
+###############################################
+
+################
+# Kernel modules
+###############
+# Set compiler options for kernel modules
+# we need to get out cmake to use the regular Linux Kernel process
+# this is documented as https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+######################################
+
+# retrieve the compiler options to send it to gccxml
+get_directory_property(DirDefs COMPILE_DEFINITIONS )
+foreach( d ${DirDefs} )
+  set(module_cc_opt "${module_cc_opt} -D${d}")
+endforeach()
+get_directory_property( DirDefs INCLUDE_DIRECTORIES )
+foreach( d ${DirDefs} )
+  set(module_cc_opt "${module_cc_opt} -I${d}")
+endforeach()
+
+EXECUTE_PROCESS(COMMAND uname -r
+  OUTPUT_VARIABLE os_release
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+SET(module_build_path /lib/modules/${os_release}/build)
+
+function(make_driver name dir)
+  file(MAKE_DIRECTORY ${OPENAIR_BIN_DIR}/${name})
+  foreach(f  IN  ITEMS ${ARGN})
+    list(APPEND src_path_list ${dir}/${f})
+    string(REGEX REPLACE "c *$" "o" obj ${f})
+    set(objs "${objs} ${obj}")
+  endforeach()
+  CONFIGURE_FILE(${OPENAIR_CMAKE}/tools/Kbuild.cmake ${OPENAIR_BIN_DIR}/${name}/Kbuild)
+  add_custom_command(OUTPUT ${name}.ko
+    COMMAND make -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name}
+    WORKING_DIRECTORY ${OPENAIR_BIN_DIR}/${name}
+    COMMENT "building ${module}.ko"
+    VERBATIM
+    SOURCES  ${src_path_list}
+    )
+  add_custom_target(${name} DEPENDS ${name}.ko)
+endfunction(make_driver name dir src)
+
+# nashmesh module
+################
+list(APPEND nasmesh_src device.c common.c ioctl.c classifier.c tool.c mesh.c)
+set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK")
+# legacy Makefile was using NAS_NETLINK flag, but other drivers the hereafter flag
+# so, this cmake use OAI_NW_DRIVER_USE_NETLINK everywhere
+if (OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND nasmesh_src netlink.c)
+endif()
+make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
+
+# user space tool for configuring MESH IP driver
+################
+add_executable(rb_tool
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
+)
+target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
+
+# ???
+####################
+list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
+if(OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND oai_nw_drv_src netlink.c)
+endif()
+make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LTE ${oai_nw_drv_src})
+
+
+# ue_ip: purpose ???
+###############
+list(APPEND ue_ip_src device.c common.c)
+if(OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND ue_ip_src netlink.c)
+endif()
+make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})
+
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
 
 set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
@@ -2352,26 +2507,10 @@ if(ENABLE_TESTS)
   # meta-target: each test is supposed to add_dependencies(tests ${NEWTEST})
   # then, it is possible to build and execute all tests using "ninja tests && ctest"
   add_custom_target(tests)
-  find_package(GTest)
-  if (NOT GTest_FOUND)
-    message(STATUS "GTest package not found, will download googletest automatically. To prevent that install google test on your system (libgtest-dev)")
-    include(FetchContent)
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        58d77fa8070e8cec2dc1ed015d66b454c8d78850 # 1.12.1
-    )
-    set(BUILD_GMOCK OFF)
-    set(INSTALL_GTEST OFF)
-    FetchContent_MakeAvailable(googletest)
-    add_library(GTest::gtest ALIAS gtest)
-    add_library(GTest::gtest_main ALIAS gtest_main)
-  endif()
 endif()
 
 add_subdirectory(common)
 add_subdirectory(doc)
-add_subdirectory(nfapi)
 add_subdirectory(openair1)
 add_subdirectory(openair2)
 add_subdirectory(openair3)

NOTICE.md

@@ -4,6 +4,15 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di
 
 However, the source code also contains third party software that is acknowledged here for reference.
 
+## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
+
+See on [liblfds website](https://liblfds.org/) the license section.
+
+<pre>
+"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
+If however for legal reasons a licence is required, the license of your choice will be granted."
+</pre>
+
 ## Credits for source code common/utils/collection/queue.h: ##
 
 The Regents of the University of California: BSD 3-Clause Licence.

README.md

@@ -4,12 +4,12 @@
 
 <p align="center">
     <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
     <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
-    <a href="https://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-Fedore40-Green" alt="Supported OS Fedora 40"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>
 
 <p align="center">
@@ -70,11 +70,11 @@ openairinterface5g
 ├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
 ├── nfapi             : (n)FAPI code for MAC-PHY interface
-├── openair1          : Layer 1 (3GPP LTE Rel-10/12 PHY, NR Rel-15 PHY)
-├── openair2          : Layer 2 (3GPP LTE Rel-10 MAC/RLC/PDCP/RRC/X2AP, LTE Rel-14 M2AP, NR Rel-15+ MAC/RLC/PDCP/SDAP/RRC/X2AP/F1AP/E1AP), E2AP
-├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
 └── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```
 

ci-scripts/Jenkinsfile-GitLab-Container

@@ -585,29 +585,6 @@ pipeline {
             }
           }
         }
-        stage ("SA-FHI72-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72Status
-              }
-            }
-          }
-        }
         stage ("SA-OAIUE-CN5G") {
           when { expression {do5Gtest} }
           steps {

ci-scripts/Jenkinsfile-nrue

@@ -229,10 +229,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

ci-scripts/Jenkinsfile-physim-deploy

@@ -221,10 +221,6 @@ pipeline {
             // Zipping all archived log files
               sh "mkdir test_logs"
               sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
               sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
               sh "rm -rf *test_log*/"
               if (fileExists("test_logs_${env.BUILD_ID}.zip")) {

ci-scripts/Jenkinsfile-push-registry

@@ -76,7 +76,7 @@ pipeline {
           withCredentials([
             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
           ]) {
-            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
+            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup"]
             // Logging in on both registries
             sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
             sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -304,7 +304,7 @@ pipeline {
                              [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
                         ]) {
                             echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
                             echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
                             sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -274,7 +274,7 @@ pipeline {
                [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
             ]) {
               echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"
 
               echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
               sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"

ci-scripts/ci_infra.yaml

@@ -18,14 +18,6 @@ up2:
   IF: wwan0
   MTU: 1500
 
-up2-fhi72:
-  Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
 sphex_quectel:
   Host: sphex
   InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
@@ -66,18 +58,9 @@ adb_ue_2:
 
 oc-cn5g:
   Host: avra
-  Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
 
-oc-cn5g-20897:
-  Host: cacofonix
-  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
@@ -116,10 +99,6 @@ amarisoft_ue:
   Host: amariue
   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
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
   Host: amariue
   AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'

ci-scripts/cls_cluster.py

@@ -43,6 +43,7 @@ NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
+CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
 CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
 CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
 
@@ -67,9 +68,10 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
-def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_deploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
@@ -82,9 +84,10 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
 	OC_logout(cmd)
 	return True, report
 
-def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_undeploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run(f'rm -Rf {path}/logs')
@@ -459,34 +462,6 @@ class Cluster:
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
 
-		if status:
-			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
-			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
-			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
-			attemptedImages += ['ran-build-fhi72']
-
-			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job')
-			status = status and wait
-			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
-		if status:
-			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
-			self._recreate_bc('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
-			attemptedImages += ['oai-gnb-fhi72']
-
-			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
-			if not wait: logging.error('error during build of gNB-fhi72')
-			status = status and wait
-			# recover logs
-			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
 		# split and analyze logs
 		imageSize = {}
 		for image in attemptedImages:

ci-scripts/cls_containerize.py

@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', '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']
 
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -286,7 +286,7 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu22'
+			self.dockerfileprefix = '.ubuntu20'
 			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
@@ -319,11 +319,9 @@ class Containerize():
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-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', ''))
-				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
-			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+			self.dockerfileprefix = '.ubuntu20.cross-arm64'
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -411,8 +409,6 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name:
-				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
@@ -449,7 +445,7 @@ class Containerize():
 			cmd.run(f"{self.cli} image prune --force")
 
 		# Remove all intermediate build images and clean up
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
 
 		# Remove some cached artifacts to prevent out of diskspace problem
@@ -681,11 +677,9 @@ class Containerize():
 			return False
 
 		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu22"
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
 		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
 		if ret.returncode != 0:
-			build_log_name = f'build_log_{self.testCase_id}'
-			CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 			logging.error(f'Cannot build unit tests')
 			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
 			HTML.CreateHtmlTabFooter(False)

ci-scripts/cls_module.py

@@ -65,8 +65,6 @@ class Module_UE:
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
 			self.runIperf3Server = m.get('RunIperf3Server', True)
-			self.namespace = m.get('Namespace')
-			self.cnPath = m.get('CNPath')
 			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')
 
 	def __str__(self):
@@ -192,12 +190,6 @@ class Module_UE:
 	def getHost(self):
 		return self.host
 
-	def getNamespace(self):
-		return self.namespace
-
-	def getCNPath(self):
-		return self.cnPath
-
 	def getRunIperf3Server(self):
 		return self.runIperf3Server
 

ci-scripts/cls_oaicitest.py

@@ -96,44 +96,45 @@ def Iperf_ComputeTime(args):
 	return int(result.group('iperf_time'))
 
 def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
-	try:
-		with open(filename) as f:
-			 results = json.load(f)
-		sender_bitrate   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file {filename}: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute Iperf3 bitrate!')
+
 	snd_msg = f'Sender Bitrate   : {sender_bitrate} Mbps'
 	rcv_msg = f'Receiver Bitrate : {receiver_bitrate} Mbps'
 	success = True
-	if iperf_tcp_rate_target is not None:
-		success = float(receiver_bitrate) >= float(iperf_tcp_rate_target)
-		if success:
-			rcv_msg += f" (target: {iperf_tcp_rate_target})"
+	if (iperf_tcp_rate_target is not None):
+		if (int(receiver_bitrate) < int(iperf_tcp_rate_target)):
+			rcv_msg += f" (too low! < {iperf_tcp_rate_target} Mbps)"
+			success = False
 		else:
-			rcv_msg += f" (too low! < {iperf_tcp_rate_target})"
+			rcv_msg += f" (target : {iperf_tcp_rate_target} Mbps)"
 	return(success, f'{snd_msg}\n{rcv_msg}')
 
 def Iperf_analyzeV3BIDIRJson(filename):
-	try:
-		with open(filename) as f:
-			results = json.load(f)
-		sender_bitrate_ul   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_ul = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-		sender_bitrate_dl   = round(results['end']['streams'][1]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_dl = round(results['end']['streams'][1]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 Bidir TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 Bidir TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate_ul   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_ul = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+			sender_bitrate_dl   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_dl = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute BIDIR bitrate!')
 
 	msg = f'Sender Bitrate DL   : {sender_bitrate_dl} Mbps\n'
 	msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'
@@ -201,6 +202,8 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 		with open(server_filename, 'r') as server_file:
 			for line in server_file.readlines():
 				result = re.search(statusTemplate, str(line))
+				if result is not None:
+					break
 		if result is None:
 			return (False, 'Could not parse server report!')
 		bitrate = float(result.group('bitrate'))
@@ -787,8 +790,10 @@ class OaiCiTest():
 		udpIperf = re.search('-u', iperf_opt) is not None
 		bidirIperf = re.search('--bidir', iperf_opt) is not None
 		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
 		ymlPath = CONTAINERS.yamlPath[0].split('/')
 		logPath = f'../cmake_targets/log/{ymlPath[1]}'
+
 		if udpIperf:
 			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
 			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
@@ -800,29 +805,36 @@ class OaiCiTest():
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
 		ue_header = f'UE {ue.getName()} ({ueIP})'
-		# create log directory on executor node
-		with cls_cmd.getConnection('localhost') as local:
-			local.run(f'mkdir -p {logPath}')
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-			port = 5002 + idx
-			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
-			t = iperf_time * 2.5
-			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
-			if runIperf3Server:
-				cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
-			localPath = f'{os.getcwd()}'
-			# note: copy iperf3 log to the directory for log collection, used by pipelines running on executor machine
-			cmd_ue.copyin(f'/tmp/{client_filename}', f'{localPath}/{logPath}/{client_filename}')
-			# note: copy iperf3 log to the current directory for log analysis and log collection
-			cmd_ue.copyin(f'/tmp/{client_filename}', f'{localPath}/{client_filename}')
-			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
-		if udpIperf:
-			status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-		elif bidirIperf:
-			status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
+
+		if svr.getName() == "rfsim4g_enb_fembms":
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				cmd_ue.run(f'{ue.getCmdPrefix()} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=iperf_time*1.5)
+				cmd_svr.run(f'{svr.getCmdPrefix()} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 2>&1 | tee {client_filename}', timeout=iperf_time*1.5)
+				cmd_ue.run(f'cp {client_filename} {logPath}/{client_filename}')
+				cmd_ue.run(f'cp {server_filename} {logPath}/{server_filename}')
+				status, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		else:
-			status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
+				t = iperf_time * 1.5
+				if runIperf3Server:
+					cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
+				cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
+				cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
+				if svr.getHost() == 'localhost':
+					cmd_ue.run(f'mkdir -p {logPath}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {client_filename}')
+				else:
+					cmd_ue.copyin(f'/tmp/{client_filename}', client_filename)
+			if udpIperf:
+				status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+			elif bidirIperf:
+				status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
+			else:
+				status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)
 
 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -860,46 +872,6 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
-	def Iperf2_Unidir(self,HTML,RAN,EPC,CONTAINERS):
-		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
-			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip())
-		svr = cls_module.Module_UE(self.svr_id)
-		ueIP = ue.getIP()
-		if not ueIP:
-			return (False, f"UE {ue.getName()} has no IP address")
-		svrIP = svr.getIP()
-		if not svrIP:
-			return (False, f"Iperf server {ue.getName()} has no IP address")
-		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
-		ymlPath = CONTAINERS.yamlPath[0].split('/')
-		logPath = f'../cmake_targets/log/{ymlPath[-1]}'
-		iperf_time = Iperf_ComputeTime(self.iperf_args)
-		target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(0, 1, self.iperf_profile, self.iperf_args)
-		t = iperf_time*2.5
-		with cls_cmd.getConnection('localhost') as local:
-			local.run(f'mkdir -p {logPath}')
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> /tmp/{server_filename} &', timeout=t)
-			cmd_svr.run(f'{svr.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1', timeout=t)
-			localPath = f'{os.getcwd()}'
-			# note: copy iperf2 log to the directory for log collection
-			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{logPath}/{server_filename}')
-			# note: copy iperf2 log to the current directory for log analysis and log collection
-			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{server_filename}')
-			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-		success, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-		ue_header = f'UE {ue.getName()} ({ueIP})'
-		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
-		for l in msg.split('\n'):
-			logging.info(f'\u001B[1;35m	{l} \u001B[0m')
-		if success:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', [f'{ue_header}\n{msg}'])
-		else:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', [f'{ue_header}\n{msg}'])
-			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
-
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
 		if (not os.path.isfile(f'./{UElogFile}')):
 			return -1

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

@@ -206,6 +206,14 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 rfsimulator: {
     serveraddr = "server";

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

@@ -202,6 +202,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 log_config : {
   global_log_level = "info";

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

@@ -206,6 +206,14 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 rfsimulator: {
 serveraddr = "server";
     serverport = 4043;

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

@@ -207,6 +207,14 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 log_config : {
   global_log_level = "info";

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

@@ -195,8 +195,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.130";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.130";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 

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

@@ -209,6 +209,14 @@ rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -85,7 +85,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        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;
@@ -217,6 +217,14 @@ rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -213,6 +213,14 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -197,6 +197,12 @@ RUs = ({
   sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
 });
 
+THREAD_STRUCT = ({
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+});
 
 security = {
   # preferred ciphering algorithms

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

@@ -199,6 +199,12 @@ RUs = ({
   sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
 });
 
+THREAD_STRUCT = ({
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+});
 
 security = {
   # preferred ciphering algorithms

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

@@ -215,6 +215,14 @@ RUs = (
   }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -220,6 +220,14 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -211,6 +211,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 rfsimulator :
 {

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

@@ -220,6 +220,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_DISABLE";
+  }
+);
 
 rfsimulator :
 {

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

@@ -212,6 +212,14 @@ RUs = (
 }
 );
 
+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);
 
 rfsimulator :
 {

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

@@ -220,6 +220,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 rfsimulator: {
     serveraddr = "server";

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

@@ -273,6 +273,14 @@ RUs = ({
   clock_src = "internal";
 });
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 rfsimulator: {
   serveraddr = "server";

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

@@ -219,6 +219,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -233,6 +233,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -233,6 +233,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -215,6 +215,14 @@ rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -232,6 +232,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -207,6 +207,14 @@ RUs = (
 }
 );
 
+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -236,6 +236,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -214,6 +214,14 @@ RUs = (
   }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -218,6 +218,15 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    //parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -211,6 +211,14 @@ RUs = (
     }
 );
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 rfsimulator :
 {

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

@@ -209,6 +209,14 @@ RUs = (
 }
 );
 
+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);
 
 rfsimulator :
 {

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -14,7 +14,7 @@ Ref :
   L1 Tx processing : 400.0
   DLSCH encoding : 177.0
   L1 Rx processing : 345.0
-  PUSCH inner-receiver : 200.0
+  PUSCH inner-receiver : 210.0
   Schedule Response : 3.0
   DL & UL scheduling timing : 13.0
   UL Indication : 3.0

ci-scripts/docker/Dockerfile.cppcheck.xenial

@@ -1,32 +1,5 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 22.04
-#
-#---------------------------------------------------------------------
 FROM ubuntu:xenial AS oai-cppcheck
 
-
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \

ci-scripts/docker/Dockerfile.formatting.bionic

@@ -1,30 +1,3 @@
-#/*
-# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# * contributor license agreements.  See the NOTICE file distributed with
-# * this work for additional information regarding copyright ownership.
-# * The OpenAirInterface Software Alliance licenses this file to You under
-# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# * except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# *      http://www.openairinterface.org/?page_id=698
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# *-------------------------------------------------------------------------------
-# * For more information about the OpenAirInterface (OAI) Software Alliance:
-# *      contact@openairinterface.org
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 22.04
-#
-#---------------------------------------------------------------------
-
 FROM ubuntu:bionic AS oai-formatting-check
 
 ARG MERGE_REQUEST

ci-scripts/docker/Dockerfile.unittest.ubuntu20

@@ -21,20 +21,15 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 22.04
+#   Valid for Ubuntu 20.04
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:develop AS ran-tests
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-        libgtest-dev
+FROM ran-base:develop as ran-tests
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests

ci-scripts/epc.py

@@ -48,7 +48,6 @@ import helpreadme as HELP
 import constants as CONST
 import cls_cluster as OC
 import cls_cmd
-import cls_module
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -76,7 +75,6 @@ class EPCManagement():
 		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 		self.OCUserName = ''
 		self.OCPassword = ''
-		self.cnID = ''
 		self.imageToPull = ''
 		self.eNBSourceCodePath = ''
 
@@ -300,8 +298,7 @@ class EPCManagement():
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			cn = cls_module.Module_UE(self.cnID)
-			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword, cn.getNamespace(), cn.getCNPath())
+			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
 				HTML.CreateHtmlTestRow('N/A', 'KO', report)
 				HTML.CreateHtmlTabFooter(False)
@@ -578,8 +575,7 @@ class EPCManagement():
 			mySSH.copyin(f'{self.SourceCodePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
 			logging.debug(message)
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			cn = cls_module.Module_UE(self.cnID)
-			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword, cn.getNamespace(), cn.getCNPath())
+			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
 				HTML.CreateHtmlTestRow('N/A', 'KO', report)
 				HTML.CreateHtmlTabFooter(False)

ci-scripts/main.py

@@ -281,14 +281,6 @@ def GetParametersFromXML(action):
 			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
 			CiTestObj.iperf_options = 'check'
 
-	elif action == 'Iperf2_Unidir':
-		CiTestObj.iperf_args = test.findtext('iperf_args')
-		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
-		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
-		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
-		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
-
 	elif action == 'IdleSleep':
 		string_field = test.findtext('idle_sleep_time_in_sec')
 		if (string_field is None):
@@ -337,13 +329,11 @@ def GetParametersFromXML(action):
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')
 
 	elif action == 'Terminate_5GCN':
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgUnDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')
 
 	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
 		eNB_instance=test.findtext('eNB_instance')
@@ -780,8 +770,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
 					elif action == 'Iperf':
 						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Iperf2_Unidir':
-						CiTestObj.Iperf2_Unidir(HTML,RAN,EPC,CONTAINERS)
 					elif action == 'Initialize_HSS':
 						EPC.InitializeHSS(HTML)
 					elif action == 'Terminate_HSS':

ci-scripts/xml_class_list.yml

@@ -21,7 +21,6 @@
   - CheckStatusUE
   - Ping
   - Iperf
-  - Iperf2_Unidir
   - Deploy_EPC
   - Undeploy_EPC
   - Initialize_HSS

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -72,8 +72,8 @@
         </testCase>
 
         <testCase id="030011">
-                <class>Iperf2_Unidir</class>
-                <desc>Iperf2 UDP DL</desc>
+                <class>Iperf</class>
+                <desc>Iperf UDP DL</desc>
                 <id>rfsim4g_ue_fembms</id>
                 <svr_id>rfsim4g_enb_fembms</svr_id>
                 <iperf_args>-u -t 30 -b 2M</iperf_args>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -97,7 +97,7 @@
         <testCase id="000022">
                 <class>Iperf</class>
                 <desc>iperf (DL/UDP/80M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 150M -t 30 -R</iperf_args>
+                <iperf_args>-u -b 80M -t 30 -R</iperf_args>
                 <svr_id>porcepix-cn5g</svr_id>
                 <id>sphex_quectel</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -1,143 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>test-5g-fhi72-vvdn</htmlTabRef>
-  <htmlTabName>100 MHz TDD SA VVDN</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    200000
-    110000
-    120000
-    102000
-    102001
-    100100
-    100010
-    100020
-    100030
-    100040
-    103000
-    100002
-    130000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Setup sriov and network interfaces VVDN</desc>
-    <node>cacofonix</node>
-    <command>/opt/FHI7.2/setup_sriov_vvdn.sh</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-  <testCase id="110000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <oc_project>oaicicd-ran</oc_project>
-    <images_to_pull>oai-gnb-fhi72</images_to_pull>
-  </testCase>
-
-  <testCase id="120000">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/VVDN) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="102001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="100100">
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>up2-fhi72</id>
-    <ping_args>-c 100 -i 0.1 172.21.6.104</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="100010">
-    <class>Iperf</class>
-    <desc>iperf (DL/300Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 300M -t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100020">
-    <class>Iperf</class>
-    <desc>iperf (UL/70Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 70M -t 30</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100040">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="103000">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="100002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="130000">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml

@@ -1,63 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>cleanup-fhi72-vvdn</htmlTabRef>
-  <htmlTabName>Cleanup VVDN</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    555555
-    666666
-    777777
-    888888
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="555555">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="666666">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="777777">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="888888">
-    <class>Custom_Command</class>
-    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
-    <node>cacofonix</node>
-    <command>/opt/FHI7.2/setup_cleanup.sh</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/sa_cn5g_20897_closure.xml

@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>cn5g-closure</htmlTabRef>
-  <htmlTabName>CN5G-Closure</htmlTabName>
-  <htmlTabIcon>log-out</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="060000">
-    <class>Terminate_5GCN</class>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-20897</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/sa_cn5g_20897_start.xml

@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-  <htmlTabRef>cn5g-start-tab</htmlTabRef>
-  <htmlTabName>CN5G-Start</htmlTabName>
-  <htmlTabIcon>log-in</htmlTabIcon>
-  <TestCaseRequestedList>
-    000100
-  </TestCaseRequestedList>
-  <TestCaseExclusionList>
-  </TestCaseExclusionList>
-
-  <testCase id="000100">
-    <class>Initialize_5GCN</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-20897</cn_id>
-  </testCase>
-</testCaseList>

ci-scripts/xml_files/sa_cn5g_closure.xml

@@ -32,7 +32,6 @@
 	<testCase id="060000">
 		<class>Terminate_5GCN</class>
 		<desc>Terminate 5G Core</desc>
-		<cn_id>oc-cn5g</cn_id>
 	</testCase>
 
 </testCaseList>

ci-scripts/xml_files/sa_cn5g_start.xml

@@ -33,6 +33,5 @@
 	<testCase id="000100">
 		<class>Initialize_5GCN</class>
 		<desc>Initialize 5G Core</desc>
-		<cn_id>oc-cn5g</cn_id>
 	</testCase>
 </testCaseList>

ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml

@@ -44,7 +44,7 @@
 		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_ulsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P</physim_run_args>
 	</testCase>
 
 	<testCase id="010121">
@@ -60,7 +60,7 @@
 		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_ulsim</physim_run>
 		<physim_time_threshold>150</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P</physim_run_args>
 	</testCase>
 
 	<testCase id="010131">
@@ -76,7 +76,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P</physim_run_args>
         </testCase>
 
         <testCase id="010211">
@@ -92,7 +92,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P</physim_run_args>
 	</testCase>
 
 	<testCase id="010221">
@@ -108,7 +108,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P</physim_run_args>
         </testCase>
 
         <testCase id="010231">
@@ -124,7 +124,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>550</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P</physim_run_args>
         </testCase>
 
         <testCase id="010311">
@@ -140,7 +140,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
         <testCase id="010321">
@@ -156,7 +156,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
         <testCase id="010331">
@@ -172,7 +172,7 @@
                 <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_ulsim</physim_run>
                 <physim_time_threshold>1100</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml

@@ -44,7 +44,7 @@
 		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_dlsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -e5 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -e5 -b106 -R106 -c -P</physim_run_args>
 	</testCase>
 
 	<testCase id="000121">
@@ -60,7 +60,7 @@
 		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_dlsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -e15 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -e15 -b106 -R106 -c -P</physim_run_args>
 	</testCase>
 
 	<testCase id="000131">
@@ -76,7 +76,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b106 -R106 -c -P</physim_run_args>
         </testCase>
 
         <testCase id="000211">
@@ -92,7 +92,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -P</physim_run_args>
 	</testCase>
 
 	<testCase id="000221">
@@ -108,7 +108,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -P</physim_run_args>
         </testCase>
 
         <testCase id="000231">
@@ -124,7 +124,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -P</physim_run_args>
         </testCase>
 
         <testCase id="000311">
@@ -140,7 +140,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
         <testCase id="000321">
@@ -156,7 +156,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
         <testCase id="000331">
@@ -172,7 +172,7 @@
                 <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
                 <physim_run>nr_dlsim</physim_run>
                 <physim_time_threshold>800</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
         </testCase>
 
 </testCaseList>

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md

@@ -12,7 +12,7 @@
   </tr>
 </table>
 
-This page is only valid for an `Ubuntu 22` host.
+This page is only valid for an `Ubuntu18` host.
 
 **Table of Contents**
 

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -113,7 +113,7 @@ services:
                                     --log_config.global_log_options level,nocolor,time
                                     --rfsimulator.options chanmod
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
@@ -143,7 +143,6 @@ services:
                                     --rfsimulator.serveraddr 192.168.71.171
                                     --rfsimulator.options chanmod
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
-            ASAN_OPTIONS: detect_odr_violation=0
         depends_on:
             - oai-du
         networks:

ci-scripts/yaml_files/5g_l2sim_tdd/README.md

@@ -12,8 +12,10 @@
   </tr>
 </table>
 
-It is also valid for `Ubuntu 22.04`.
+This page is valid for an `Ubuntu18` host.
+It is also valid for `Ubuntu 20.04`.
 
+This tutorial is only valid once this file is merged into the `develop` branch.
 # 1. Adapt the `docker-compose` to your environment #
 The yaml file is in the following directory:  `ci-scripts/yaml_files/5g_l2sim_tdd`
 

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -12,7 +12,7 @@
   </tr>
 </table>
 
-This page is only valid for an `Ubuntu 22` host.
+This page is only valid for an `Ubuntu18` host.
 
 **NOTE: this version (2023-01-27) has been updated  for the `v1.5.0` version of the `OAI 5G CN`.**
 
@@ -535,40 +535,3 @@ snssais:
 ```
 
 The `ST` and `SD` values shall also match.
-
-
-# 6. Running with local changes
-
-You can run the testcase with local changes by substituting the binaries in
-execution images. `local-override.yaml` file provides a way to substitute the
-gNB and nrUE executables as well as librfsimulator.so. Refer to the `-volumes`
-section in the file for details. This includes an image build service as well as
-code compilation service. This is necessary as the executable has to be linked
-against the same libraries that are present in the executing image. This might
-take a while the first time but other that that is very fast. Here is a list of
-commands (wait between each command). Tested with `docker compose` v2.27.0
-
-
-This command deploys OAI 5G Core Network
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
-```
-This command builds base images locally, builds local gNB & nrUE executable and
-runs the gnb service with modified gNB executable.
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-gnb
-```
-This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with 
-modified nrUE executable.
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-nr-ue
-```
-
-## 6.1 Running nrUE in gdb
-`local-override-ue-gdb.yaml` is an additional override file which can be used
-to run the UE executable in gdb. Replace the last command above with the
-following:
-
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml -f local-override-ue-gdb.yaml run oai-nr-ue
-```

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -109,7 +109,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -133,7 +133,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -157,7 +157,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -181,7 +181,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -205,7 +205,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -229,7 +229,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -253,7 +253,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -277,7 +277,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -301,7 +301,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -325,7 +325,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml

@@ -1,6 +0,0 @@
-services:
-  oai-nr-ue:
-    privileged: true
-    stdin_open: true
-    tty: true
-    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/5g_rfsimulator/local-override.yaml

@@ -1,27 +0,0 @@
-include:
-  - ../local_common_overrides/build_images.yaml
-  - ../local_common_overrides/rebuild_nr_softmodems.yaml
-services:
-  oai-gnb:
-    privileged: true
-    depends_on:
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-softmodem:/opt/oai-gnb/bin/nr-softmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so
-  oai-nr-ue:
-    privileged: true
-    image: ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-        restart: true
-      oai-gnb:
-        condition: service_started
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-uesoftmodem:/opt/oai-nr-ue/bin/nr-uesoftmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so 
-      - ../../../crashdumps/:/cores/

ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/local-override.yaml

@@ -1,27 +0,0 @@
-include:
-  - ../local_common_overrides/build_images.yaml
-  - ../local_common_overrides/rebuild_nr_softmodems.yaml
-services:
-  oai-gnb:
-    privileged: true
-    depends_on:
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    # volumes:
-    # replace the gnb executable here
-  oai-nr-ue:
-    privileged: true
-    image: ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-        restart: true
-      oai-gnb:
-        condition: service_started
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    container_name: local-oai-nr-ue
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-uesoftmodem:/opt/oai-nr-ue/bin/nr-uesoftmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so 
-      - ../../../crashdumps/:/cores/

ci-scripts/yaml_files/local_common_overrides/build_images.yaml

@@ -1,45 +0,0 @@
-services:
-  build-ran-base:
-    image: ran-base
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.base.ubuntu22
-      tags:
-        - ran-base
-
-  build-ran-build:
-    image: ran-build
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.build.ubuntu22
-      tags:
-        - ran-build
-    depends_on:
-      build-ran-base:
-        condition: service_completed_successfully
-  
-  build-gnb-image:
-    image: gnb-local
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.gNB.ubuntu22
-      tags:
-        - gnb-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-    entrypoint: ""
-    command: echo "gnb-image built"
-
-  build-ue-image:
-    image: ue-local
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.nrUE.ubuntu22
-      tags:
-        - ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-    entrypoint: ""
-    command: echo "ue-image built"

ci-scripts/yaml_files/local_common_overrides/rebuild_nr_softmodems.yaml

@@ -1,13 +0,0 @@
-services:
-  rebuild-nr-softmodems:
-    image: ran-build
-    volumes:
-      - ../../../:/oai-dir/
-    command:
-      bash -c "cd /oai-dir/ && mkdir -p cmake_targets/ran_build/build && cd cmake_targets/ran_build/build && cmake ../../../ -GNinja && cmake --build . --target nr-uesoftmodem rfsimulator nr-softmodem"
-    entrypoint: ""
-    depends_on:
-      build-gnb-image:
-        condition: service_completed_successfully
-      build-ue-image:
-        condition: service_completed_successfully

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/README.md

@@ -1,15 +0,0 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="../../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI O-RAN 7.2 Front-haul Docker Compose</font></b>
-    </td>
-  </tr>
-</table>
-
-For instructions on OAI gNB Docker deployment with FH 7.2 RU, please refer to the [README](../sa_fhi_7.2_vvdn_gnb/README.md).

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/docker-compose.yml

@@ -1,40 +0,0 @@
-services:
-    oai-gnb:
-        image: oai-gnb-fhi72:latest
-        cap_add:
-            - SYS_ADMIN
-            - IPC_LOCK
-            - SYS_NICE
-        cap_drop:
-            - ALL
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 6,7,8,9
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-        # Please change these values based on your system
-        cpuset: "0,1,2,3,4,5,6,7,8,9"
-        networks:
-            oai-net:
-                ipv4_address: 172.21.18.20
-        healthcheck:
-           test: /bin/bash -c "pgrep nr-softmodem"
-           interval: 10s
-           timeout: 5s
-           retries: 5
-networks:
-    oai-net:
-        driver: macvlan
-        name: oai-net
-        ipam:
-            config:
-                - subnet: "172.21.16.0/22"
-                  ip_range: "172.21.18.20/32"
-                  gateway: "172.21.19.254"
-        driver_opts:
-            com.docker.network.bridge.name: "oai-net"
-            parent: ens7f0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/setup_cleanup.sh

@@ -1,5 +0,0 @@
-set -e
-sudo cpupower idle-set -E > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=950000
-sudo sysctl kernel.timer_migration=1
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_gnb/setup_sriov_benetel.sh

@@ -1,22 +0,0 @@
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0
-sudo ethtool -G ens7f1 rx 8160
-sudo ethtool -G ens7f1 tx 8160
-sudo ifconfig ens7f1 mtu 9216
-sudo sh -c 'echo 0 > /sys/class/net/ens7f1/device/sriov_numvfs'
-sudo sh -c 'echo 2 > /sys/class/net/ens7f1/device/sriov_numvfs'
-sudo modprobe -r iavf
-sudo modprobe iavf
-# this next 2 lines is for C/U planes
-sudo ip link set ens7f1 vf 0 mac 00:11:22:33:44:66 vlan 3 qos 0 spoofchk off mtu 9216
-sudo ip link set ens7f1 vf 1 mac 00:11:22:33:44:67 vlan 3 qos 0 spoofchk off mtu 9216
-sleep 1
-# These are the DPDK bindings for C/U-planes on vlan 3
-sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.0
-sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.1
-sudo modprobe vfio-pci
-sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.0
-sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.1
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/README.md

@@ -1,87 +0,0 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="../../../doc/images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI O-RAN 7.2 Front-haul Docker Compose</font></b>
-    </td>
-  </tr>
-</table>
-
-![Docker deploy 7.2](../../../doc/images/docker-deploy-oai-7-2.png)
-
-This docker-compose is designed to use `OAI-gNB` with a 7.2 compatible Radio Unit. Before using this docker compose you have to configure
-the host machine as per the [ORAN_FHI7.2_Tutorial](../../../doc/ORAN_FHI7.2_Tutorial.md). The container image used by the docker compose file is tested only on `Ubuntu 22.04` and `RHEL 9.4` docker host.
-
-## Build Image (Optional)
-
-Refer to [OAI Docker/Podman Build and Usage Procedures](../../../docker/README.md)
-
-## Configure Networking
-
-### SR-IOV Virtual Functions (VFs)
-
-In docker-compose environment there is no automated method
-to configure the VFs on the fly. The user will have to manually configure
-C/U plane VFs before starting the container `OAI-gNB`.
-
-You can follow the step
-[configure-network-interfaces-and-dpdk-vfs](../../../doc/ORAN_FHI7.2_Tutorial.md#configure-network-interfaces-and-dpdk-vfs).
-
-### Interface towards AMF (N2)
-
-For `N2` interface we are using `macvlan` driver of docker.
-
-You can use the `bridge` driver, in situation
-
-- When the core network is running on the same machine
-- or different machine but you have configured
-needed `ip route` and forwarding to access the core network from RAN host.
-
-To configure docker `macvlan` network
-you need to choose `ipam.config` and `driver_opts.parent` are per your environment
-
-```
-    oai-net:
-        driver: macvlan
-        name: oai-net
-        ipam:
-            config:
-                - subnet: "172.21.16.0/22"
-                  ip_range: "172.21.18.20/32"
-                  gateway: "172.21.19.254"
-        driver_opts:
-            com.docker.network.bridge.name: "oai-net"
-            parent: enp193s0f0
-```
-
-To configure `bridge` network you need to choose `ipam.config.subnet` as per your environment.
-
-```
-    oai-net:
-        driver: bridge
-        name: oai-net
-        ipam:
-            config:
-                - subnet: 192.168.72.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "oai-net"
-```
-
-## Deploy OAI-gNB Container
-
-The [configuration file](../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf) used by docker compose is configured for VVDN RU.
-
-```bash
-docker-compose up -d
-```
-
-To check the logs
-
-```bash
-docker logs oai-gnb -f
-```

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml

@@ -1,40 +0,0 @@
-services:
-    oai-gnb:
-        image: oai-gnb-fhi72:latest
-        cap_add:
-            - SYS_ADMIN
-            - IPC_LOCK
-            - SYS_NICE
-        cap_drop:
-            - ALL
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 6,7,8,9
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-        # Please change these values based on your system
-        cpuset: "0,1,2,3,4,5,6,7,8,9"
-        networks:
-            oai-net:
-                ipv4_address: 172.21.18.20
-        healthcheck:
-           test: /bin/bash -c "pgrep nr-softmodem"
-           interval: 10s
-           timeout: 5s
-           retries: 5
-networks:
-    oai-net:
-        driver: macvlan
-        name: oai-net
-        ipam:
-            config:
-                - subnet: "172.21.16.0/22"
-                  ip_range: "172.21.18.20/32"
-                  gateway: "172.21.19.254"
-        driver_opts:
-            com.docker.network.bridge.name: "oai-net"
-            parent: ens7f0

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh

@@ -1,5 +0,0 @@
-set -e
-sudo cpupower idle-set -E > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=950000
-sudo sysctl kernel.timer_migration=1
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh

@@ -1,21 +0,0 @@
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0
-sudo ethtool -G ens7f1 rx 8160
-sudo ethtool -G ens7f1 tx 8160
-sudo sh -c 'echo 0 > /sys/class/net/ens7f1/device/sriov_numvfs'
-sudo sh -c 'echo 2 > /sys/class/net/ens7f1/device/sriov_numvfs'
-sudo modprobe -r iavf
-sudo modprobe iavf
-# this next 2 lines is for C/U planes
-sudo ip link set ens7f1 vf 0 mac 76:76:64:6e:00:01 vlan 4 spoofchk off mtu 9216
-sudo ip link set ens7f1 vf 1 mac 76:76:64:6e:00:00 vlan 4 spoofchk off mtu 9216
-sleep 1
-# These are the DPDK bindings for C/U-planes on vlan 4
-sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.0
-sudo /usr/local/bin/dpdk-devbind.py --unbind c3:11.1
-sudo modprobe vfio-pci
-sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.0
-sudo /usr/local/bin/dpdk-devbind.py --bind vfio-pci c3:11.1
-exit 0

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

@@ -15,7 +15,7 @@ export CUDA_MPS_PIPE_DIRECTORY=/var
 export CUDA_MPS_LOG_DIRECTORY=/var
 
 # Stop existing MPS
-sudo -E echo quit | sudo -E nvidia-cuda-mps-control
+echo quit | nvidia-cuda-mps-control
 
 # Start MPS
 sudo -E nvidia-cuda-mps-control -d

cmake_targets/autotests/test_case_list.xml

@@ -12,15 +12,15 @@
                               (Test 10b: 5 MHz, R6-1.FDD (MCS 24,18 PRB), EVA5, 17.5dB (70%)),
                               (Test 11: 10 MHz, R7.FDD (MCS 25), EVA5, 17.7dB (70%))</desc>
       <main_exec>dlsim</main_exec>
-      <main_exec_args> -m=5 -g=F -s=-1 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -Tperf=60
-                       -m=4 -g=F -s=0 -w=1.0 -f=.2 -n=500 -B=6 -c=4 -z=2 -Tperf=60
-                       -m=15 -g=F -s=6.7 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -Tperf=60
-                       -m=15 -g=F -s=6.7 -w=1.0 -f=.2 -n=500 -B=25 -c=2 -z=2 -Tperf=60
-                       -m=15 -g=G -s=1.4 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -Tperf=25
-                       -m=15 -g=G -s=1.4 -w=1.0 -f=.2 -n=500 -B=25 -c=2 -z=2 -Tperf=25
-                       -m=25 -g=F -s=17.4 -w=1.0 -f=.2 -n=500 -B=25 -c=3 -z=2 -Tperf=60
-                       -m=25 -g=F -s=17.5 -w=1.0 -f=.2 -n=500 -B=25 -c=3 -z=2 -r=1022 -Tperf=60
-                       -m=26 -g=F -s=17.7 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -Tperf=60</main_exec_args>
+      <main_exec_args> -m=5 -g=F -s=-1 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -O=60
+                       -m=4 -g=F -s=0 -w=1.0 -f=.2 -n=500 -B=6 -c=4 -z=2 -O=60
+                       -m=15 -g=F -s=6.7 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -O=60
+                       -m=15 -g=F -s=6.7 -w=1.0 -f=.2 -n=500 -B=25 -c=2 -z=2 -O=60
+                       -m=15 -g=G -s=1.4 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -O=25
+                       -m=15 -g=G -s=1.4 -w=1.0 -f=.2 -n=500 -B=25 -c=2 -z=2 -O=25
+                       -m=25 -g=F -s=17.4 -w=1.0 -f=.2 -n=500 -B=25 -c=3 -z=2 -O=60
+                       -m=25 -g=F -s=17.5 -w=1.0 -f=.2 -n=500 -B=25 -c=3 -z=2 -r=1022 -O=60
+                       -m=26 -g=F -s=17.7 -w=1.0 -f=.2 -n=500 -B=50 -c=2 -z=2 -O=60</main_exec_args>
       <tags>test1 test5 test6 test6b test7 test7b test10 test10b test11</tags>
       <search_expr_true>"passed"</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
@@ -34,11 +34,11 @@
                               (TM2 Test 1: 10 MHz, R.11 FDD (MCS 14), EVA5, 6.8 dB (70%)),
                               (TM2 Test 1b: 5 MHz, R.11-2 FDD (MCS 13), EVA5, 5.9 dB (70%))</desc>
       <main_exec>dlsim</main_exec>
-      <main_exec_args> -m=26 -g=F -s=17.6 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -Tperf=60
-                       -m=26 -g=F -s=17.3 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -r=1600 -Tperf=60
-                       -m=26 -g=F -s=16.6 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -r=1899 -Tperf=60
-                       -m=14 -g=F -s=6.8  -w=1.0 -f=.2 -n=500 -B=50 -c=2 -x=2 -y=2 -z=2 -Tperf=60
-                       -m=13 -g=F -s=5.9  -w=1.0 -f=.2 -n=500 -B=25 -c=3 -x=2 -y=2 -z=2 -Tperf=60</main_exec_args>
+      <main_exec_args> -m=26 -g=F -s=17.6 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -O=60
+                       -m=26 -g=F -s=17.3 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -r=1600 -O=60
+                       -m=26 -g=F -s=16.6 -w=1.0 -f=.2 -n=500 -B=100 -c=2 -z=2 -r=1899 -O=60
+                       -m=14 -g=F -s=6.8  -w=1.0 -f=.2 -n=500 -B=50 -c=2 -x=2 -y=2 -z=2 -O=60
+                       -m=13 -g=F -s=5.9  -w=1.0 -f=.2 -n=500 -B=25 -c=3 -x=2 -y=2 -z=2 -O=60</main_exec_args>
       <tags>test15 test15b test15c TM2_test1 TM2_test1b</tags>
       <search_expr_true>"passed"</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
@@ -53,12 +53,12 @@
              (Test 5: 20 MHz, FDD (MCS 5), AWGN, 6dB (70%)),
              (Test 6: 20 MHz, FDD (MCS 16), AWGN, 12 dB (70%))</desc>
       <main_exec>ulsim</main_exec>
-      <main_exec_args> -BnbRBs=25 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70
-                       -BnbRBs=25 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70
-                       -BnbRBs=50 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70
-                       -BnbRBs=50 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70
-                       -BnbRBs=100 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70
-                       -BnbRBs=100 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Tperf=70</main_exec_args>
+      <main_exec_args> -BnbRBs=25 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
+                       -BnbRBs=25 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
+                       -BnbRBs=50 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70  
+                       -BnbRBs=50 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
+                       -BnbRBs=100 -mcs=5 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=6 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 
+                       -BnbRBs=100 -mcs=16 -yN_rx=1 -gchannel=N -xTransmission=1 -snr=12 -wsnrInterrupt=1.0 -e_snr_step=.1 -P -nb_frame=500 -Operf=70 </main_exec_args>
       <tags>test1 test2 test3 test4 test5 test6</tags>
       <search_expr_true>"passed"</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
@@ -116,7 +116,7 @@
       <main_exec>nr_pbchsim</main_exec>
       <main_exec_args>-s-11 -S-8 -n10 -R106 -N2
                       -s-11 -S-8 -n10 -o8000 -I -R106
-                      -s-11 -S-8 -n10 -R106 -c6</main_exec_args>
+                      -s-11 -S-8 -n10 -R106 -O6</main_exec_args>
       <tags>test1 test2 test3</tags>
       <search_expr_true>PBCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>

cmake_targets/build_oai

@@ -46,13 +46,13 @@ BUILD_DOXYGEN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t2 websrv oai_iqplayer"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t2 websrv oai_iqplayer"
 TARGET_LIST=""
 
 function print_help() {
   echo_info "
 This script compiles OpenAirInterface Software, and can install dependencies
-for a number of distributions (Ubuntu 22-24, Fedora, RHEL9).
+for a number of distributions (Ubuntu 18-22, Fedora, RHEL7/8).
 Options:
 --arch-native
    Passes -march=native to the compiler.
@@ -85,7 +85,7 @@ Options:
 --RU
   Makes the OAI RRU
 --UE
-   Makes the UE specific parts (usim, nvram) from the given configuration file
+   Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
 --nrUE
   Makes the NR UE softmodem
 --UE-conf-nvram [configuration file]
@@ -271,6 +271,9 @@ function main() {
        --UE-gen-nvram)
             gen_nvram_path=$(readlink -f "$2")
             shift 2;;
+       --UE-ip)
+            TARGET_LIST="$TARGET_LIST ue_ip"
+            shift;;
        -w | --hardware)
             case "$2" in
                 "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
@@ -415,6 +418,7 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_ADDRESS=True -DSANITIZE_UNDEFINED=True"
             shift;;
         --sanitize-address | -fsanitize=address)
+            grep -sq "Ubuntu 18.04" /etc/os-release && echo_error "Bug in OS with this option, see CMakeLists.txt"
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_ADDRESS=True"
             shift;;
         --sanitize-undefined | -fsanitize=undefined)

cmake_targets/cross-arm.cmake

@@ -1,8 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR arm)
 
-set(CMAKE_C_COMPILER   /usr/bin/aarch64-linux-gnu-gcc-11)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-11)
+set(CMAKE_C_COMPILER   /usr/bin/aarch64-linux-gnu-gcc-9)
+set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-9)
 
 set(CROSS_COMPILE 1)
 set(bnProc_gen_128_DIR    ${CMAKE_CURRENT_BINARY_DIR}/${NATIVE_DIR}) # /../build)

cmake_targets/tools/MODULES/Findxran.cmake

@@ -109,8 +109,6 @@ elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.1")
   set(xran_VERSION 5.1.1)
 elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.2")
   set(xran_VERSION 5.1.2)
-elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.3")
-  set(xran_VERSION 5.1.3)
 endif()
 unset(xran_VERSION_LINE)
 unset(xran_VERSION_STRING)

cmake_targets/tools/build_helper

@@ -103,11 +103,11 @@ get_distribution_release() {
 check_supported_distribution() {
     local distribution=$(get_distribution_release)
     case "$distribution" in
-        "ubuntu24.04") return 0 ;;
         "ubuntu23.10") return 0 ;;
         "ubuntu22.04") return 0 ;;
         "ubuntu21.04") return 0 ;;
         "ubuntu20.04") return 0 ;;
+        "ubuntu18.04") return 0 ;;
         "debian11")    return 0 ;;
         "fedora36")    return 0 ;;
         "fedora37")    return 0 ;;
@@ -171,6 +171,10 @@ clean_kernel() {
     $SUDO iptables -t filter -F
     $SUDO iptables -t raw -F
     echo_info "Flushed iptables"
+    $SUDO rmmod nasmesh > /dev/null 2>&1
+    $SUDO rmmod oai_nw_drv  > /dev/null 2>&1
+    $SUDO rmmod ue_ip > /dev/null 2>&1
+    echo_info "removed drivers from kernel"
 }
 
 clean_all_files() {
@@ -265,14 +269,6 @@ install_usrp_uhd_driver_from_source(){
             # - 3.15.0.0
             git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff
             ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
-        elif [[ "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then
-            # Tested that patch for the following versions:
-            # - 4.7.0.0
-            cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            sed -i '9,13 s/STATE_OFF/STATE_RX1_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            sed -i '24,28 s/STATE_OFF/STATE_RX2_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
         else
             # Tested that patch for the following versions:
             # - 4.0.0.0
@@ -325,7 +321,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get remove libuhd3.14.1 -y || true
         $SUDO apt-get remove libuhd3.15.0 -y || true
         local distribution=$(get_distribution_release)
-        if [[ "$distribution" == "ubuntu20.04" || "$distribution" == "ubuntu22.04" ]]; then
+        if [[ "$distribution" == "ubuntu18.04" || "$distribution" == "ubuntu20.04" || "$distribution" == "ubuntu22.04" ]]; then
             $SUDO apt-get remove libuhd4.?.? -y || true
         fi
         v=$(lsb_release -cs)
@@ -355,7 +351,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get update
         $SUDO apt-get -y install python-tk  $boost_libs_ubuntu libusb-1.0-0-dev
         case "$(get_distribution_release)" in
-          "ubuntu20.04" | "ubuntu22.04")
+          "ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
             $SUDO apt-get -y install libuhd-dev libuhd4.5.0 uhd-host
             ;;
         esac
@@ -532,11 +528,24 @@ check_install_soapy () {
     install_soapy_iris_from_source
 }
 
+# for ubuntu 18 we need a special repository (https://apt.kitware.com/) to install cmake >= 3.12
+add_cmake_repo () {
+  $SUDO $INSTALLER -y install wget
+  wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | $SUDO tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+  echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | $SUDO tee /etc/apt/sources.list.d/kitware.list >/dev/null
+  $SUDO $INSTALLER -y update
+  $SUDO rm /usr/share/keyrings/kitware-archive-keyring.gpg
+  $SUDO $INSTALLER -y install kitware-archive-keyring
+}
+
 check_install_additional_tools (){
   $SUDO $INSTALLER update -y
   local optional_packages=""
   if [[ "$OS_BASEDISTRO" == "debian" ]]; then
     case "$(get_distribution_release)" in
+        "ubuntu18.04")
+            optional_packages="python-dev python-pip python-pyroute2 python python-numpy python-scipy python-matplotlib ctags"
+            ;;
         "ubuntu20.04" | "ubuntu21.04" | "ubuntu22.04" | "debian11" )
             optional_packages="python3 python3-pip python3-dev python3-scipy python3-matplotlib python3-pyroute2 universal-ctags"
             ;;
@@ -545,6 +554,7 @@ check_install_additional_tools (){
         doxygen \
         libgnutls28-dev \
         libpthread-stubs0-dev \
+        libqt5charts5-dev \
         tshark \
         uml-utilities \
         iperf3 \
@@ -576,6 +586,10 @@ check_install_oai_software() {
   if [[ "$OS_BASEDISTRO" == "debian" ]]; then
     $SUDO apt install -y software-properties-common
     case "$(get_distribution_release)" in
+        "ubuntu18.04")
+            add_cmake_repo
+            specific_packages=""
+            ;;
          "debian11")
             specific_packages="libz-dev"
             ;;
@@ -588,6 +602,7 @@ check_install_oai_software() {
         ninja-build \
 	pkg-config \
 	git \
+	libatlas-base-dev \
 	libblas-dev \
 	liblapack-dev \
 	liblapacke-dev \
@@ -617,6 +632,7 @@ check_install_oai_software() {
       gcc \
       gcc-c++ \
       git \
+      atlas-devel \
       pkgconfig \
       libconfig-devel \
       libffi-devel \

cmake_targets/tools/init_nas_nos1

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+#/*
+# * 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
+# */
+
+# file init_nas_nos1
+# brief loads the nasmesh module and sets up the radio bearers (used to provide ip interface without S1 interface)
+# author Florian Kaltenberger
+#
+#######################################
+
+load_module() {
+  mod_name=${1##*/}
+  mod_name=${mod_name%.*}
+  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
+    then
+      echo "module $mod_name already loaded: I remove it first"
+      sudo rmmod $mod_name
+  fi
+  echo loading $mod_name
+  sudo insmod $1
+}
+
+load_module $OPENAIR_DIR/cmake_targets/ran_build/build/nasmesh.ko
+
+if [ "$1" = "eNB" ]; then 
+     echo "bring up oai0 interface for enb"
+     sudo ifconfig oai0 10.0.1.1 netmask 255.255.255.0 broadcast 10.0.1.255
+     $OPENAIR_DIR/cmake_targets/ran_build/build/rb_tool -a -c0 -i0 -z0 -s 10.0.1.1 -t 10.0.1.2 -r 1
+else
+    if [ "$1" = "UE" ]; then 
+       echo "bring up oai0 interface for UE"
+       sudo ifconfig oai0 10.0.1.2 netmask 255.255.255.0 broadcast 10.0.1.255
+       $OPENAIR_DIR/cmake_targets/ran_build/build/rb_tool -a -c0 -i0 -z0 -s 10.0.1.2 -t 10.0.1.1 -r 1
+    fi
+fi  

cmake_targets/tools/init_nas_s1

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+#WARNING: this file may not work properly, be sure to know what you
+#do when using it
+
+#/*
+# * 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
+# */
+
+################################################################################
+# file init_nas_s1
+# brief loads the ue_ip module and sets up IP for the UE
+# you may want to edit it to fit your settings (replace oip0 by oipX for
+# instance)
+# author Florian Kaltenberger
+#
+#######################################
+
+LTEIF=oip1
+#OPENAIR_DIR=/home/oai/svn-oai/openair4G
+
+load_module() {
+  mod_name=${1##*/}
+  mod_name=${mod_name%.*}
+  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
+    then
+      echo "module $mod_name already loaded: I remove it first"
+      sudo rmmod $mod_name
+  fi
+  echo loading $mod_name
+  sudo insmod $1
+}
+
+load_module ../ran_build/build/ue_ip.ko
+
+if [ "$1" = "UE" ]; then
+  echo "bring up $LTEIF interface for UE"
+  sudo ifconfig $LTEIF up
+fi
+
+sudo ip route flush cache
+sleep 1
+sudo sysctl -w net.ipv4.conf.all.log_martians=1
+echo "Disabling reverse path filtering"
+sudo sysctl -w net.ipv4.conf.all.rp_filter=0
+sudo ip route flush cache
+
+# Check table 200 lte in /etc/iproute2/rt_tables
+fgrep lte /etc/iproute2/rt_tables  > /dev/null 
+if [ $? -ne 0 ]; then
+    echo "200 lte " >> /etc/iproute2/rt_tables
+fi
+sudo ip rule add fwmark 1 table lte
+sudo ip route add default dev $LTEIF table lte

cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch

@@ -7,7 +7,7 @@ index 7508117..0dbe0bd 100644
  #include <rte_mbuf.h>
  
 -#define VERSIONX                "oran_e_maintenance_release_v1.0"
-+#define VERSIONX                "oran_e_maintenance_release_v1.3"
++#define VERSIONX                "oran_e_maintenance_release_v1.2"
  
  #define APP_O_DU  0
  #define APP_O_RU  1
@@ -114,7 +114,7 @@ index 7419ae1..a85f973 100644
   * @ingroup xran
   *
 diff --git a/fhi_lib/lib/api/xran_up_api.h b/fhi_lib/lib/api/xran_up_api.h
-index 7d3afc5..e2f1f21 100644
+index 7d3afc5..3e00c5a 100644
 --- a/fhi_lib/lib/api/xran_up_api.h
 +++ b/fhi_lib/lib/api/xran_up_api.h
 @@ -80,6 +80,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
@@ -125,16 +125,6 @@ index 7d3afc5..e2f1f21 100644
      union ecpri_seq_id *seq_id,
      uint16_t *num_prbu,
      uint16_t *start_prbu,
-@@ -89,7 +90,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     int8_t   expect_comp,
-     enum xran_comp_hdr_type staticComp,
-     uint8_t *compMeth,
--    uint8_t *iqWidth);
-+    uint8_t *iqWidth,
-+    uint8_t *is_prach);
- 
- inline int xran_prepare_iq_symbol_portion(
-                         struct rte_mbuf *mbuf,
 diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
 index b6ba257..b53325f 100644
 --- a/fhi_lib/lib/ethernet/ethdi.c
@@ -183,18 +173,9 @@ index e6d3067..8e0abee 100644
  static int16_t saturateAbs(int16_t inVal)
  {
 diff --git a/fhi_lib/lib/src/xran_bfp_uplane.cpp b/fhi_lib/lib/src/xran_bfp_uplane.cpp
-index a345df4..109b05a 100644
+index a345df4..7831fa0 100644
 --- a/fhi_lib/lib/src/xran_bfp_uplane.cpp
 +++ b/fhi_lib/lib/src/xran_bfp_uplane.cpp
-@@ -90,7 +90,7 @@ namespace BFP_UPlane
-   {
-     const __m512i* rawData = reinterpret_cast<const __m512i*>(dataIn.dataExpanded);
-     /// Abs
--    const auto rawDataAbs = _mm512_abs_epi16(rawData[0]);
-+    const auto rawDataAbs = _mm512_abs_epi16(_mm512_loadu_epi16(rawData));
-     /// No need to do a full horizontal max operation here, just do a max IQ step,
-     /// compute the exponents and then use a reduce max over all exponent values. This
-     /// is the fastest way to handle a single RB.
 @@ -116,7 +116,7 @@ namespace BFP_UPlane
      /// Get AVX512 pointer aligned to desired RB
      const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
@@ -214,18 +195,10 @@ index a345df4..109b05a 100644
      dataOut->dataCompressed[thisRBExpAddr] = thisExp;
      /// Now have 1 RB worth of bytes separated into 3 chunks (1 per lane)
 diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
-index baa673f..00bfdf2 100644
+index baa673f..edd4ecb 100644
 --- a/fhi_lib/lib/src/xran_common.c
 +++ b/fhi_lib/lib/src/xran_common.c
-@@ -650,12 +650,15 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-     uint8_t compMeth = 0;
-     uint8_t iqWidth = 0;
- 
-+    uint8_t is_prach = 0;
-+
-     void *pHandle = NULL;
-     int ret = MBUF_FREE;
-     uint32_t mb_free = 0;
+@@ -656,6 +656,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
      int32_t valid_res = 0;
      int expect_comp  = (p_dev_ctx->fh_cfg.ru_conf.compMeth != XRAN_COMPMETHOD_NONE);
      enum xran_comp_hdr_type staticComp = p_dev_ctx->fh_cfg.ru_conf.xranCompHdrType;
@@ -233,7 +206,7 @@ index baa673f..00bfdf2 100644
  
      if (staticComp == XRAN_COMP_HDR_TYPE_STATIC)
      {
-@@ -674,6 +677,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
+@@ -674,6 +675,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
                                          &subframe_id,
                                          &slot_id,
                                          &symb_id,
@@ -241,14 +214,7 @@ index baa673f..00bfdf2 100644
                                          &seq,
                                          &num_prbu,
                                          &start_prbu,
-@@ -683,28 +687,15 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-                                         expect_comp,
-                                         staticComp,
-                                         &compMeth,
--                                        &iqWidth);
-+                                        &iqWidth,
-+                                        &is_prach);
-     if (num_bytes <= 0){
+@@ -688,23 +690,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
          print_err("num_bytes is wrong [%d]\n", num_bytes);
          return MBUF_FREE;
      }
@@ -275,16 +241,7 @@ index baa673f..00bfdf2 100644
  #ifndef FCN_ADAPT
      if(valid_res != 0) {
          print_dbg("valid_res is wrong [%d] ant %u (%u : %u : %u : %u) seq %u num_bytes %d\n", valid_res, Ant_ID, frame_id, subframe_id, slot_id, symb_id, seq.seq_id, num_bytes);
-@@ -756,7 +747,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-             print_dbg("Transport layer fragmentation (eCPRI) is not supported\n");
-         }
- 
--    } else if (Ant_ID >= p_dev_ctx->PrachCPConfig.eAxC_offset && p_dev_ctx->fh_cfg.prachEnable) {
-+    } else if (/*Ant_ID >= p_dev_ctx->PrachCPConfig.eAxC_offset && */p_dev_ctx->fh_cfg.prachEnable && is_prach) {
-         /* PRACH packet has ruportid = num_eAxc + ant_id */
-         Ant_ID -= p_dev_ctx->PrachCPConfig.eAxC_offset;
-         symbol_total_bytes[p_dev_ctx->xran_port_id][CC_ID][Ant_ID] += num_bytes;
-@@ -1189,7 +1180,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
+@@ -1189,7 +1177,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
          timeOffset += startSymId * (2048 + 144);
      }
      timeOffset = timeOffset >> nNumerology; //original number is Tc, convert to Ts based on mu
@@ -293,7 +250,7 @@ index baa673f..00bfdf2 100644
          timeOffset += 16;
  
      params->dir                  = XRAN_DIR_UL;
-@@ -1295,8 +1286,7 @@ int32_t ring_processing_func(void* args)
+@@ -1295,8 +1283,7 @@ int32_t ring_processing_func(void* args)
  
      for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i++){
          for(qi = 0; qi < ctx->rxq_per_port[i]; qi++) {
@@ -473,7 +430,7 @@ index 36bd72c..f7f5678 100644
                  int idx = 0;
                  uint16_t *psrc = (uint16_t *)iq_data_start;
 diff --git a/fhi_lib/lib/src/xran_up_api.c b/fhi_lib/lib/src/xran_up_api.c
-index 397853a..8977e3d 100644
+index 397853a..4a714b5 100644
 --- a/fhi_lib/lib/src/xran_up_api.c
 +++ b/fhi_lib/lib/src/xran_up_api.c
 @@ -329,6 +329,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
@@ -484,26 +441,7 @@ index 397853a..8977e3d 100644
      union ecpri_seq_id *seq_id,
      uint16_t *num_prbu,
      uint16_t *start_prbu,
-@@ -338,7 +339,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     int8_t   expect_comp,
-     enum xran_comp_hdr_type staticComp,
-     uint8_t *compMeth,
--    uint8_t *iqWidth)
-+    uint8_t *iqWidth,
-+    uint8_t *is_prach)
- {
- #if XRAN_MLOG_VAR
-     uint32_t mlogVar[10];
-@@ -374,6 +376,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-         return 0;       /* packet too short */
- 
-     radio_hdr->sf_slot_sym.value = rte_be_to_cpu_16(radio_hdr->sf_slot_sym.value);
-+    if (radio_hdr->data_feature.filter_id > 0) *is_prach = 1;
-+    else *is_prach = 0;
- 
-     if (frame_id)
-         *frame_id    = radio_hdr->frame_id;
-@@ -387,6 +391,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+@@ -387,6 +388,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
      if (symb_id)
          *symb_id = radio_hdr->sf_slot_sym.symb_id;
  
@@ -512,7 +450,7 @@ index 397853a..8977e3d 100644
      /* Process data section hdr */
      struct data_section_hdr *data_hdr =
          (void *)rte_pktmbuf_adj(mbuf, sizeof(*radio_hdr));
-@@ -401,6 +407,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
+@@ -401,6 +404,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
      *sym_inc    = data_hdr->fields.sym_inc;
      *rb         = data_hdr->fields.rb;
      *sect_id    = data_hdr->fields.sect_id;

common/config/DOC/config/rtusage.md

@@ -58,6 +58,7 @@ To get help on supported parameters you can use specific options:
     --emulate-rf: Emulated RF enabled(disable by defult)
     --clock: tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)
     --wait-for-sync: Help string not specified
+    --single-thread-enable: Disables single-thread mode in lte-softmodem
     -C: Set the downlink frequency for all component carriers
     -a: Channel id offset
     -d: Enable soft scope and L1 and L2 stats (Xforms)
@@ -68,6 +69,7 @@ To get help on supported parameters you can use specific options:
     --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'
     --nbiot-disable: disable nb-iot, even if defined in config
     --noS1: Disable s1 interface
+    --nokrnmod: (noS1 only): Use tun instead of namesh module
 --------------------------------------------------------------------
 
 [LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value)

common/utils/CMakeLists.txt

@@ -10,9 +10,3 @@ if(ENABLE_WEBSRV)
 endif()
 
 add_subdirectory(T)
-add_subdirectory(nr)
-add_subdirectory(LOG)
-add_subdirectory(threadPool)
-add_library(utils utils.c system.c time_meas.c time_stat.c tun_if.c)
-target_include_directories(utils PUBLIC .)
-target_link_libraries(utils PRIVATE ${T_LIB})

common/utils/LOG/CMakeLists.txt

@@ -1,10 +0,0 @@
-set(log_sources log.c)
-if (ENABLE_LTTNG)
-  set(log_sources ${log_sources} lttng-tp.c)
-endif()
-add_library(LOG ${log_sources})
-target_include_directories(LOG PUBLIC .)
-target_link_libraries(LOG PRIVATE ${T_LIB})
-if (ENABLE_LTTNG)
-  target_link_libraries(LOG PUBLIC lttng-ust)
-endif()

common/utils/LOG/log.h

@@ -28,7 +28,7 @@
 */
 
 #ifndef __LOG_H__
-#define __LOG_H__
+#    define __LOG_H__
 
 /*--- INCLUDES ---------------------------------------------------------------*/
 #include <unistd.h>
@@ -526,8 +526,8 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
   } while (0)
 
 #define nfapi_log(FILE, FNC, LN, COMP, LVL, FMT...)
-#define LOG_DEBUGFLAG(D) (g_log->debug_mask & D)
-#define LOG_DUMPFLAG(D) (g_log->dump_mask & D)
+#define LOG_DEBUGFLAG(D) (g_log->dump_mask & D)
+#define LOG_DUMPFLAG(D) (g_log->debug_mask & D)
 #define LOG_DUMPMSG(c, f, b, s, x...)      \
   do {                                     \
     if (g_log->dump_mask & f)              \

common/utils/T/DOC/T/wireshark.md

@@ -99,52 +99,46 @@ Use a recent version of wireshark. The steps below were done using
 version 3.3.2. Maybe some options are different for your version
 of wireshark. Adapt as necessary.
 
-1) First, do the previous steps for LTE.
-2) Then, in the menu, choose `Edit->Preferences`.
-3) In the preference window, unroll `Protocols` and configure the following:
+First, do the previous steps for LTE.
 
-**MAC**
+Then, in the menu, choose `Edit->Preferences`.
 
-Go to `MAC-NR`. Select:
+In the preference window, unroll `Protocols`.
 
-* `Attempt to decode BCCH, PCCH and CCCH data using NR RRC dissector`
-* `Attempt to dissect LCID 1-3 as srb1-3`
+Go to `MAC-NR`. Select both options (`Attempt to decode BCCH, PCCH and CCCH data using NR RRC dissector`
+and `Attempt to dissect LCID 1-3 as srb1-3`).
 
-For `Source of LCID -> drb channel settings`:
-* choose option `From static table`.
-* click the `Edit...` button of `LCID -> DRB Mappings Table`.
-* In the new window, click on `+`. Choose LCID `4`, DRBID `1`, UL RLC Bearer
+For `Source of LCID -> drb channel settings` choose option `From static table`.
+Then click the `Edit...` button of `LCID -> DRB Mappings Table`.
+
+In the new window, click on `+`. Choose LCID `4`, DRBID `1`, UL RLC Bearer
 Type `AM, SN Len=18`, same thing for DL RLC Bearer Type.
-* Click OK.
 
-**RLC**
+Then click OK.
 
-Now, go to `RLC-NR`. Select:
+Now, go to `RLC-NR`. Select `Call PDCP dissector for SRB PDUs`.
 
-* `Call PDCP dissector for SRB PDUs`.
-* `Call PDCP dissector for UL DRB PDUs` choose `18-bit SN`. Same for DL.
-* `Call RRC dissector for CCCH PDUs`.
-* `Try to reassemble AM frames`.
+For `Call PDCP dissector for UL DRB PDUs` choose `18-bit SN`. Same
+for DL.
+
+Select `Call RRC dissector for CCCH PDUs`.
 
 You don't need to select `May see RLC headers only` and
 `Try to reassemble UM frames`.
 
-**PDCP**
-
-Now, go to `PDCP-NR`. Select what you need in there.
-
-It's good to select:
-* `Show uncompressed User-Plane data as IP`
-* `Show unciphered Signalling-Plane data as RRC`.
-* `Only-RLC-frames` in `Do sequence number analysis`, but anything will do.
-* `Traffic Info` as layer info to show, depending on what you want to analyse.
-
-We don't use ROHC so you don't need to select `Attempt to decode ROHC data`.
+Now, go to `PDCP-NR`. Select what you want in there. It's good
+to select `Show uncompressed User-Plane data as IP`. Also good
+to select `Show unciphered Signalling-Plane data as RRC`.
+For `Do sequence number analysis` it can be good to use
+`Only-RLC-frames` but anything will do. We don't use ROHC so you
+don't need to select `Attempt to decode ROHC data`. And the
+layer info to show depends on what you want to analyse.
+`Traffic Info` is a good choice.
 
 You are done with the preferences. You can click OK.
 
-4) Then, in the menu `Analyze`, choose `Enabled Protocols...`.
-5) In the new window search for `nr` and select `mac_nr_udp` to have `MAC-NR over UDP`.
+Then, in the menu `Analyze`, choose `Enabled Protocols...`. In the new window
+search for `nr` and select `mac_nr_udp` to have `MAC-NR over UDP`.
 
 And that's it. Maybe other settings can be changed, but those steps should be
 enough for a start.

common/utils/T/T_messages.txt

@@ -9,11 +9,6 @@ ID = USRP_RX_ANT0
     GROUP = ALL:HEAVY
     FORMAT = int,timestap : buffer,data
 
-ID = USRP_TX_ANT0
-    DESC = TX IQ data as sent by USRP driver on antenna 0
-    GROUP = ALL:HEAVY
-    FORMAT = int,timestap : buffer,data
-
 #PHY logs
 ID = ENB_PHY_UL_TICK
     DESC = eNodeB uplink tick - one tick per ms at start of uplink processing

common/utils/nr/CMakeLists.txt

@@ -1,6 +0,0 @@
-add_library(nr_common nr_common.c)
-target_include_directories(nr_common PUBLIC .)
-target_link_libraries(nr_common PRIVATE UTIL)
-if (ENABLE_TESTS)
-  add_subdirectory(tests)
-endif()

common/utils/nr/nr_common.c

@@ -105,16 +105,6 @@ int get_supported_band_index(int scs, frequency_range_t freq_range, int n_rbs)
   return (-1); // not found
 }
 
-int get_smallest_supported_bandwidth_index(int scs, frequency_range_t frequency_range, int n_rbs)
-{
-  int scs_index = scs + frequency_range;
-  for (int i = 0; i < 12; i++) {
-    if (n_rbs <= tables_5_3_2[scs_index][i])
-      return i;
-  }
-  return -1; // not found
-}
-
 // Table 5.2-1 NR operating bands in FR1 & FR2 (3GPP TS 38.101)
 // Table 5.4.2.3-1 Applicable NR-ARFCN per operating band in FR1 & FR2 (3GPP TS 38.101)
 // Notes:
@@ -309,31 +299,65 @@ void check_ssb_raster(uint64_t freq, int band, int scs)
               band);
 }
 
-int get_supported_bw_mhz(frequency_range_t frequency_range, int bw_index)
+int get_supported_bw_mhz(frequency_range_t frequency_range, int scs, int nb_rb)
 {
+  int bw_index = get_supported_band_index(scs, frequency_range, nb_rb);
   if (frequency_range == FR1) {
-    int bandwidth_index_to_mhz[] = {5, 10, 15, 20, 25, 30, 40, 50, 60, 80, 90, 100};
-    AssertFatal(bw_index >= 0 && bw_index <= sizeofArray(bandwidth_index_to_mhz),
-                "Bandwidth index %d is invalid\n",
-                bw_index);
-    return bandwidth_index_to_mhz[bw_index];
-  } else {
-    int bandwidth_index_to_mhz[] = {50, 100, 200, 400};
-    AssertFatal(bw_index >= 0 && bw_index <= sizeofArray(bandwidth_index_to_mhz),
-                "Bandwidth index %d is invalid\n",
-                bw_index);
-    return bandwidth_index_to_mhz[bw_index];
+    switch (bw_index) {
+      case 0 :
+        return 5; // 5MHz
+      case 1 :
+        return 10;
+      case 2 :
+        return 15;
+      case 3 :
+        return 20;
+      case 4 :
+        return 25;
+      case 5 :
+        return 30;
+      case 6 :
+        return 40;
+      case 7 :
+        return 50;
+      case 8 :
+        return 60;
+      case 9 :
+        return 80;
+      case 10 :
+        return 90;
+      case 11 :
+        return 100;
+      default :
+        AssertFatal(false, "Invalid band index for FR1 %d\n", bw_index);
+    }
+  }
+  else {
+    switch (bw_index) {
+      case 0 :
+        return 50; // 50MHz
+      case 1 :
+        return 100;
+      case 2 :
+        return 200;
+      case 3 :
+        return 400;
+      default :
+        AssertFatal(false, "Invalid band index for FR2 %d\n", bw_index);
+    }
   }
 }
 
-bool compare_relative_ul_channel_bw(int nr_band, int scs, int channel_bandwidth, frame_type_t frame_type)
+bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_t frame_type)
 {
   // 38.101-1 section 6.2.2
   // Relative channel bandwidth <= 4% for TDD bands and <= 3% for FDD bands
   int index = get_nr_table_idx(nr_band, scs);
+
+  int band_size_khz = get_supported_bw_mhz(nr_band > 256 ? FR2 : FR1, scs, nb_ul) * 1000;
   float limit = frame_type == TDD ? 0.04 : 0.03;
-  float rel_bw = (float) (2 * channel_bandwidth * 1000) / (float) (nr_bandtable[index].ul_max - nr_bandtable[index].ul_min);
-  return rel_bw > limit;
+  float rel_bw = (float) (2 * band_size_khz) / (float) (nr_bandtable[index].ul_max + nr_bandtable[index].ul_min);
+  return rel_bw <= limit;
 }
 
 uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
@@ -365,10 +389,7 @@ uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
   printf("DL frequency %"PRIu64": band %d, UL frequency %"PRIu64"\n",
         downlink_frequency, current_band, downlink_frequency+delta_duplex);
 
-  AssertFatal(current_band != 0,
-              "Can't find EUTRA band for frequency %" PRIu64 " and duplex_spacing %d\n",
-              downlink_frequency,
-              delta_duplex);
+  AssertFatal(current_band != 0, "Can't find EUTRA band for frequency %"PRIu64" and duplex_spacing %u\n", downlink_frequency, delta_duplex);
 
   return current_band;
 }
@@ -620,9 +641,16 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports)
 
 frame_type_t get_frame_type(uint16_t current_band, uint8_t scs_index)
 {
+  frame_type_t current_type;
   int32_t delta_duplex = get_delta_duplex(current_band, scs_index);
-  frame_type_t current_type = delta_duplex == 0 ? TDD : FDD;
-  LOG_D(NR_MAC, "NR band %d, duplex mode %s, duplex spacing = %d KHz\n", current_band, duplex_mode[current_type], delta_duplex);
+
+  if (delta_duplex == 0)
+    current_type = TDD;
+  else
+    current_type = FDD;
+
+  LOG_I(NR_MAC, "NR band %d, duplex mode %s, duplex spacing = %d KHz\n", current_band, duplex_mode[current_type], delta_duplex);
+
   return current_type;
 }
 
@@ -633,7 +661,7 @@ int32_t get_delta_duplex(int nr_bandP, uint8_t scs_index)
 
   int32_t delta_duplex = (nr_bandtable[nr_table_idx].ul_min - nr_bandtable[nr_table_idx].dl_min);
 
-  LOG_D(NR_MAC, "NR band duplex spacing is %d KHz (nr_bandtable[%d].band = %d)\n", delta_duplex, nr_table_idx, nr_bandtable[nr_table_idx].band);
+  LOG_I(NR_MAC, "NR band duplex spacing is %d KHz (nr_bandtable[%d].band = %d)\n", delta_duplex, nr_table_idx, nr_bandtable[nr_table_idx].band);
 
   return delta_duplex;
 }
@@ -1002,13 +1030,13 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
 static double get_start_freq(const double fc, const int nbRB, const int mu)
 {
   const int scs = MU_SCS(mu) * 1000;
-  return fc - ((double)nbRB / 2 * NR_NB_SC_PER_RB * scs);
+  return fc - (nbRB / 2 * NR_NB_SC_PER_RB * scs);
 }
 
 static double get_stop_freq(const double fc, const int nbRB, const int mu)
 {
   int scs = MU_SCS(mu) * 1000;
-  return fc + ((double)nbRB / 2 * NR_NB_SC_PER_RB * scs);
+  return fc + (nbRB / 2 * NR_NB_SC_PER_RB * scs);
 }
 
 static void compute_M_and_N(const int gscn, int *rM, int *rN)
@@ -1073,7 +1101,6 @@ static void find_gscn_to_scan(const double startFreq,
     *scanGscnStart = g;
     break;
   }
-  *scanGscnStop = *scanGscnStart;
 
   for (int g = gscn.last_gscn; g > gscn.first_gscn; g -= gscn.step_gscn) {
     const double centerSSBFreq = get_ssref_from_gscn(g);
@@ -1099,23 +1126,21 @@ int get_scan_ssb_first_sc(const double fc, const int nbRB, const int nrBand, con
   const double startFreq = get_start_freq(fc, nbRB, mu);
   const double stopFreq = get_stop_freq(fc, nbRB, mu);
 
-  int scanGscnStart = 0;
-  int scanGscnStop = 0;
-  const sync_raster_t *tmpRaster = sync_raster;
-  const sync_raster_t * end=sync_raster + sizeofArray(sync_raster);
-  while (tmpRaster < end && (tmpRaster->band != nrBand || tmpRaster->scs_index != mu))
-    tmpRaster++;
-  if (tmpRaster >= end) {
-    LOG_E(PHY, "raster not found nrband=%d, mu=%d\n", nrBand, mu);
-    return 0;
+  int scanGscnStart = -1;
+  int scanGscnStop = -1;
+  sync_raster_t tmpRaster = {0};
+  for (const sync_raster_t *r = sync_raster; r < r + (sizeof(sync_raster) / sizeof(sync_raster_t)); r++) {
+    if (r->band == nrBand && r->scs_index == mu) {
+      tmpRaster = *r;
+      break;
+    }
   }
-
-  find_gscn_to_scan(startFreq, stopFreq, *tmpRaster, &scanGscnStart, &scanGscnStop);
+  find_gscn_to_scan(startFreq, stopFreq, tmpRaster, &scanGscnStart, &scanGscnStop);
 
   const double scs = MU_SCS(mu) * 1e3;
-  const double pointA = fc - ((double)nbRB / 2 * scs * NR_NB_SC_PER_RB);
+  const double pointA = fc - (nbRB / 2 * scs * NR_NB_SC_PER_RB);
   int numGscn = 0;
-  for (int g = scanGscnStart; (g <= scanGscnStop) && (numGscn < MAX_GSCN_BAND); g += tmpRaster->step_gscn) {
+  for (int g = scanGscnStart; (g <= scanGscnStop) && (numGscn < MAX_GSCN_BAND); g += tmpRaster.step_gscn) {
     ssbInfo[numGscn].ssRef = get_ssref_from_gscn(g);
     ssbInfo[numGscn].ssbFirstSC = get_ssb_first_sc(pointA, ssbInfo[numGscn].ssRef, mu);
     ssbInfo[numGscn].gscn = g;
@@ -1149,6 +1174,38 @@ void init_delay_table(uint16_t ofdm_symbol_size,
   }
 }
 
+void freq2time(uint16_t ofdm_symbol_size,
+               int16_t *freq_signal,
+               int16_t *time_signal)
+{
+  const idft_size_idx_t idft_size = get_idft(ofdm_symbol_size);
+  idft(idft_size, freq_signal, time_signal, 1);
+}
+
+void nr_est_delay(int ofdm_symbol_size, const c16_t *ls_est, c16_t *ch_estimates_time, delay_t *delay)
+{
+  freq2time(ofdm_symbol_size, (int16_t *)ls_est, (int16_t *)ch_estimates_time);
+
+  int max_pos = delay->delay_max_pos;
+  int max_val = delay->delay_max_val;
+  const int sync_pos = 0;
+
+  for (int i = 0; i < ofdm_symbol_size; i++) {
+    int temp = c16amp2(ch_estimates_time[i]) >> 1;
+    if (temp > max_val) {
+      max_pos = i;
+      max_val = temp;
+    }
+  }
+
+  if (max_pos > ofdm_symbol_size / 2)
+    max_pos = max_pos - ofdm_symbol_size;
+
+  delay->delay_max_pos = max_pos;
+  delay->delay_max_val = max_val;
+  delay->est_delay = max_pos - sync_pos;
+}
+
 void nr_timer_start(NR_timer_t *timer)
 {
   timer->active = true;

common/utils/nr/nr_common.h

@@ -38,10 +38,9 @@
 #include "assertions.h"
 #include "PHY/defs_common.h"
 
-#define NR_MAX_PDSCH_TBS 3824
 #define MAX_BWP_SIZE 275
 #define NR_MAX_NUM_BWP 4
-#define NR_MAX_HARQ_PROCESSES 32
+#define NR_MAX_HARQ_PROCESSES 16
 #define NR_NB_REG_PER_CCE 6
 #define NR_NB_SC_PER_RB 12
 #define NR_MAX_NUM_LCID 32
@@ -225,8 +224,8 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports);
 uint16_t SL_to_bitmap(int startSymbolIndex, int nrOfSymbols);
 int get_nb_periods_per_frame(uint8_t tdd_period);
 long rrc_get_max_nr_csrs(const int max_rbs, long b_SRS);
-bool compare_relative_ul_channel_bw(int nr_band, int scs, int channel_bandwidth, frame_type_t frame_type);
-int get_supported_bw_mhz(frequency_range_t frequency_range, int bw_index);
+bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_t frame_type);
+int get_supported_bw_mhz(frequency_range_t frequency_range, int scs, int nb_rb);
 int get_supported_band_index(int scs, frequency_range_t freq_range, int n_rbs);
 void get_samplerate_and_bw(int mu,
                            int n_rb,
@@ -242,6 +241,12 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
 int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA, int scs);
 int get_delay_idx(int delay, int max_delay_comp);
 
+void freq2time(uint16_t ofdm_symbol_size,
+               int16_t *freq_signal,
+               int16_t *time_signal);
+
+void nr_est_delay(int ofdm_symbol_size, const c16_t *ls_est, c16_t *ch_estimates_time, delay_t *delay);
+
 int get_scan_ssb_first_sc(const double fc,
                           const int nbRB,
                           const int nrBand,
@@ -249,7 +254,6 @@ int get_scan_ssb_first_sc(const double fc,
                           nr_gscn_info_t ssbStartSC[MAX_GSCN_BAND]);
 
 void check_ssb_raster(uint64_t freq, int band, int scs);
-int get_smallest_supported_bandwidth_index(int scs, frequency_range_t frequency_range, int n_rbs);
 
 #define CEILIDIV(a,b) ((a+b-1)/b)
 #define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))

common/utils/nr/tests/CMakeLists.txt

@@ -1,5 +0,0 @@
-add_executable(test_nr_common test_nr_common.cpp)
-target_link_libraries(test_nr_common PRIVATE nr_common GTest::gtest minimal_lib)
-add_dependencies(tests test_nr_common)
-add_test(NAME test_nr_common
-  COMMAND ./test_nr_common)

common/utils/oai_asn1.h

@@ -34,7 +34,7 @@
     TYPE *tmp = ORIGIN;                          \
     ORIGIN = DESTINATION;                        \
     DESTINATION = tmp;                           \
-  } while (0)                                    \
+  } while(0);                                    \
 
 // Same as above but swapping ASN1 elements that are not pointers
 #define UPDATE_NP_IE(DESTINATION, ORIGIN, TYPE)     \
@@ -42,7 +42,7 @@
     TYPE tmp = ORIGIN;                              \
     ORIGIN = DESTINATION;                           \
     DESTINATION = tmp;                              \
-  } while (0)                                       \
+  } while(0);                                       \
 
 // Macro handles reception of SetupRelease element ORIGIN (see NR_SetupRelease.h)
 // If release (NR_SetupRelease_xxx_PR_release equivalent to 1), removing structure from DESTINATION
@@ -55,7 +55,7 @@
     }                                                                  \
     if (ORIGIN->present == 2)                                          \
       UPDATE_IE(DESTINATION, ORIGIN->choice.setup, TYPE);              \
-  } while (0)                                                          \
+  } while(0);                                                          \
 
 // Macro handles reception of SetupRelease element ORIGIN (see NR_SetupRelease.h)
 // If release (NR_SetupRelease_xxx_PR_release equivalent to 1), removing structure from DESTINATION
@@ -72,7 +72,7 @@
       DESTINATION->present = ORIGIN->present;                               \
       UPDATE_IE(DESTINATION->choice.setup, ORIGIN->choice.setup, TYPE);     \
     }                                                                       \
-  } while (0)                                                               \
+  } while(0);                                                               \
 
 // Macro releases entries in list TARGET if the corresponding ID is found in list SOURCE.
 // Prints an error if ID not found in list.
@@ -85,7 +85,7 @@
         if (eL == TARGET->list.array[iJ]->FIELD)                                   \
           break;                                                                   \
       }                                                                            \
-      if (iJ < TARGET->list.count)                                                 \
+      if (iJ == TARGET->list.count)                                                \
         asn_sequence_del(&TARGET->list, iJ, 1);                                    \
       else                                                                         \
         LOG_E(NR_MAC, "Element not present in the list, impossible to release\n"); \

common/utils/telnetsrv/CMakeLists.txt

@@ -36,7 +36,6 @@ add_library(telnetsrv MODULE
 )
 target_link_libraries(telnetsrv PRIVATE history)
 target_link_libraries(telnetsrv PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-target_link_libraries(telnetsrv PRIVATE UTIL)
 
 message(STATUS "Add enb specific telnet functions in libtelnetsrv_enb.so")
 add_library(telnetsrv_enb MODULE

common/utils/telnetsrv/telnetsrv_5Gue_measurements.c

@@ -86,15 +86,7 @@ int get_measurgroups(telnet_measurgroupdef_t **measurgroups) {
 
 void measurcmd_display_phycpu(telnet_printfunc_t prnt) {
   PHY_VARS_NR_UE *UE = PHY_vars_UE_g[0][0];
-  telnet_cpumeasurdef_t cpumeasur[MAX_CPU_STAT_TYPE];
-  for (int i = 0; i < MAX_CPU_STAT_TYPE; i++) {
-    sprintf(cpumeasur[i].statname, "%s", UE->phy_cpu_stats.cpu_time_stats[i].meas_name);
-    cpumeasur[i].astatptr = &UE->phy_cpu_stats.cpu_time_stats[i];
-    cpumeasur[i].statemask = 0;
-    cpumeasur[i].num_occur1 = 1;
-    cpumeasur[i].num_occur2 = 0;
-    cpumeasur[i].num_occur3 = 0;
-  }
+  telnet_cpumeasurdef_t  cpumeasur[]=CPU_PHYNRUE_MEASURE;
   prnt("%s cpu (%1.1g GHz) measurements: PHY (cpustats %s) %s\n",HDR,cpufreq,
        PRINT_CPUMEAS_STATE,HDR);
   measurcmd_display_cpumeasures(prnt, cpumeasur, sizeof(cpumeasur)/sizeof(telnet_cpumeasurdef_t));

common/utils/telnetsrv/telnetsrv_cpumeasur_def.h

@@ -95,4 +95,51 @@
   {"ip_pdcp",                &(pdcpvars->ip_pdcp),0,1},\
 }
 
+/* from openair1/PHY/defs_nr_UE.h */
+#define CPU_PHYNRUE_MEASURE \
+{ \
+    {"phy_proc",          &(UE->phy_proc),0,1},\
+    {"phy_proc_rx",       &(UE-> phy_proc_rx),0,1},\
+    {"phy_proc_tx",       &(UE->phy_proc_tx),0,1},\
+    {"ue_ul_indication_stats",       &(UE->ue_ul_indication_stats),0,1},\
+    {"ofdm_mod_stats",       &(UE->ofdm_mod_stats),0,1},\
+    {"ulsch_encoding_stats",       &(UE->ulsch_encoding_stats),0,1},\
+    {"ulsch_modulation_stats",       &(UE->ulsch_modulation_stats),0,1},\
+    {"ulsch_segmentation_stats",       &(UE->ulsch_segmentation_stats),0,1},\
+    {"ulsch_rate_matching_stats",       &(UE->ulsch_rate_matching_stats),0,1},\
+    {"ulsch_ldpc_encoding_stats",       &(UE->ulsch_ldpc_encoding_stats),0,1},\
+    {"ulsch_interleaving_stats",       &(UE->ulsch_interleaving_stats),0,1},\
+    {"ulsch_multiplexing_stats",       &(UE->ulsch_multiplexing_stats),0,1},\
+    {"ofdm_demod_stats",       &(UE->ofdm_demod_stats),0,1},\
+    {"dlsch_rx_pdcch_stats",       &(UE->dlsch_rx_pdcch_stats),0,1},\
+    {"rx_dft_stats",       &(UE->rx_dft_stats),0,1},\
+    {"dlsch_c...timation_stats",       &(UE->dlsch_channel_estimation_stats),0,1},\
+    {"dlsch_f...timation_stats",       &(UE->dlsch_freq_offset_estimation_stats),0,1},\
+    {"dlsch_demodulation_stats",       &(UE->dlsch_demodulation_stats),0,1},\
+    {"dlsch_rate_unmatching_stats",       &(UE->dlsch_rate_unmatching_stats),0,1},\
+    {"dlsch_ldpc_decoding_stats",       &(UE->dlsch_ldpc_decoding_stats),0,1},\
+    {"dlsch_deinterleaving_stats",       &(UE->dlsch_deinterleaving_stats),0,1},\
+    {"dlsch_llr_stats",       &(UE->dlsch_llr_stats),0,1},\
+    {"dlsch_unscrambling_stats",       &(UE->dlsch_unscrambling_stats),0,1},\
+    {"dlsch_rate_matching_stats",       &(UE->dlsch_rate_matching_stats),0,1},\
+    {"dlsch_ldpc_encoding_stats",       &(UE->dlsch_ldpc_encoding_stats),0,1},\
+    {"dlsch_interleaving_stats",       &(UE->dlsch_interleaving_stats),0,1},\
+    {"dlsch_tc_init_stats",       &(UE->dlsch_tc_init_stats),0,1},\
+    {"dlsch_tc_alpha_stats",       &(UE->dlsch_tc_alpha_stats),0,1},\
+    {"dlsch_tc_beta_stats",       &(UE->dlsch_tc_beta_stats),0,1},\
+    {"dlsch_tc_gamma_stats",       &(UE->dlsch_tc_gamma_stats),0,1},\
+    {"dlsch_tc_ext_stats",       &(UE->dlsch_tc_ext_stats),0,1},\
+    {"dlsch_tc_intl1_stats",       &(UE->dlsch_tc_intl1_stats),0,1},\
+    {"dlsch_tc_intl2_stats",       &(UE->dlsch_tc_intl2_stats),0,1},\
+    {"tx_prach",       &(UE->tx_prach),0,1},\
+    {"ue_front_end_stat",       &(UE->ue_front_end_stat),0,1},\
+    {"ue_front_end_per_slot_stat",      &(UE->ue_front_end_per_slot_stat[0]),0,LTE_SLOTS_PER_SUBFRAME},\
+    {"pdcch_procedures_stat",       &(UE->pdcch_procedures_stat),0,1},\
+    {"rx_pdsch_stats",              &(UE->rx_pdsch_stats), 0, 1}, \
+    {"pdsch_procedures_stat",       &(UE->pdsch_procedures_stat),0,1},\
+    {"pdsch_procedures_per_slot_stat",  &(UE->pdsch_procedures_per_slot_stat[0]),0,LTE_SLOTS_PER_SUBFRAME},\
+    {"dlsch_procedures_stat",       &(UE->dlsch_procedures_stat),0,1},\
+    {"dlsch_decoding_stats",       &(UE->dlsch_decoding_stats),0,1},\
+    {"dlsch_llr_stats_para", &(UE->dlsch_llr_stats_parallelization[0]),0,LTE_SLOTS_PER_SUBFRAME},\
+}
 #endif