Changes to support multiple TDD patterns

- Updated the configuration changes for 2 Patterns
- Update the TDD table configuration for NFAPI
- Added the tdd config map for the period

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)
@@ -268,7 +284,6 @@ add_boolean_option(DEBUG_ASN1 False "Enable ASN1 debug logs" OFF)
 # see common/utils/config.h
 add_boolean_option(TRACE_ASN1C_ENC_DEC OFF "Enable ASN1 encoder/decoder debug traces via OAI logging system" ON)
 add_boolean_option(T_TRACER            True  "Activate the T tracer, a debugging/monitoring framework" ON)
-add_boolean_option(ENABLE_LTTNG        False "Activate the LTTNG tracer, a debugging/monitoring framework" ON)
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs" ON)
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
@@ -447,7 +462,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 +523,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,22 +649,17 @@ 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)
-else()
-  message(STATUS "LTTNG support disabled")
-endif()
-
-pkg_check_modules(cap libcap)
-if (cap_FOUND)
-  # see system.c for more info
-  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 +733,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 +771,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)
 
@@ -785,6 +801,7 @@ set(PHY_POLARSRC
   ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_crc.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -1150,10 +1167,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_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)
@@ -1176,9 +1192,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
 #####################
@@ -1380,9 +1397,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
@@ -1431,7 +1448,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)
@@ -1441,7 +1458,6 @@ add_library(L2_NR
   ${MAC_NR_SRC}
   ${GNB_APP_SRC}
   )
-target_link_libraries(L2_NR PRIVATE ds alg)
 
 add_library(e1_if
   ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1450,10 +1466,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)
@@ -1480,11 +1493,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
@@ -1895,6 +1912,8 @@ 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)
 
@@ -1914,9 +1933,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
@@ -1947,6 +1967,7 @@ add_executable(lte-softmodem
   ${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
@@ -1958,7 +1979,7 @@ 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
+  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)
 
@@ -2004,17 +2025,21 @@ add_executable(lte-uesoftmodem
   ${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 SIMU_ETH 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)
 
@@ -2040,17 +2065,21 @@ add_executable(nr-softmodem
   ${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 SIMU_ETH
+  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)
 
@@ -2058,11 +2087,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()
@@ -2111,14 +2135,16 @@ add_executable(nr-uesoftmodem
   ${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 SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
@@ -2166,6 +2192,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
@@ -2174,6 +2201,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
@@ -2199,6 +2227,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
@@ -2209,6 +2238,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
@@ -2219,6 +2249,7 @@ 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
@@ -2236,6 +2267,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
@@ -2246,6 +2278,7 @@ 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
@@ -2262,6 +2295,7 @@ 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
@@ -2271,6 +2305,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
@@ -2282,6 +2317,7 @@ 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
@@ -2343,7 +2379,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
@@ -2354,18 +2390,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 SIMU_ETH OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)
+        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")
@@ -2376,26 +2492,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)

CONTRIBUTING.md

@@ -5,26 +5,22 @@ We want to make contributing to this project as easy and transparent as possible
 Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).
 
 1. Sign and return a Contributor License Agreement to OAI team.
-2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
-   if you do not have any.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up) if you do not have any.
    - We recommend that you register with a professional or student email address.
-   - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:contact@openairinterface.org).
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us (mailto:contact@openairinterface.org).
    - Eurecom GitLab does NOT accept public email domains.
-3. Provide the OAI team with the **username** of this account to
-   (mailto:contact@openairinterface.org) ; we will give you the developer
-   rights on this repository.
-4. The contributing policies are described in the [corresponding documentation
-   page](doc/code-style-contrib.md).
-   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account.
-     It just eats up space on our servers.
-   - You can fork onto another hosting system. But we will NOT accept a merge
-     request from a forked repository.
+3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
+4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home).
+   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account. It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge request from a forked repository.
       * This decision was made for the license reasons.
       * The Continuous Integration will reject your merge request.
+   - All merge requests SHALL have `develop` branch as target branch.
 
-# License #
+## Coding Styles ##
 
-By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under the license described in the file [`LICENSE`](./LICENSE) in the
-root directory of this source tree.
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home).
+
+## License ##
+
+By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.

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-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-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/cls_containerize.py

@@ -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'
@@ -321,7 +321,7 @@ class Containerize():
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 		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:
@@ -412,10 +412,10 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2023.11.28.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')
+				cmd.run('rm -f nvipc_src.2023.11.28.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -668,7 +668,7 @@ class Containerize():
 				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
-					baseTag = 'ci-temp'
+					baseTag = 'develop'
 		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		if ret.returncode != 0:
 			logging.error(f'No {baseImage} image present, cannot build tests')
@@ -677,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)
@@ -690,8 +688,8 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:{baseTag}')
+		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
+		cmd.run(f'docker rmi ran-unittests:develop')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 		cmd.close()
@@ -899,7 +897,9 @@ class Containerize():
 		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)
 
 		# Checking Status
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5)
+		grep = ''
+		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
+		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0

ci-scripts/cls_oaicitest.py

@@ -810,7 +810,7 @@ class OaiCiTest():
 			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*2.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)
@@ -818,11 +818,10 @@ class OaiCiTest():
 			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
 				if runIperf3Server:
-					cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
+					cmd_svr.run(f'{svr.getCmdPrefix()} nohup iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=iperf_time*1.5)
 				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)
+				cmd_ue.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=iperf_time*1.5)
 				if svr.getHost() == 'localhost':
 					cmd_ue.run(f'mkdir -p {logPath}')
 					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')

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

@@ -22,8 +22,8 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -44,8 +44,8 @@ gNBs =
     NETWORK_INTERFACES :
     {
 
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

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

@@ -23,8 +23,8 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -46,16 +46,16 @@ gNBs =
     (
       {
         type = "cp";
-        ipv4_cucp = "127.0.0.4";
+        ipv4_cucp = "192.168.68.194";
         port_cucp = 38462;
-        ipv4_cuup = "127.0.0.6";
+        ipv4_cuup = "192.168.68.196";
         port_cuup = 38462;
       }
     )
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
     };
   }
 );

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

@@ -21,8 +21,8 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "127.0.0.6";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.196";
+    remote_s_address = "192.168.68.195";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -40,15 +40,15 @@ gNBs =
     (
       {
         type = "up";
-        ipv4_cucp = "127.0.0.4";
-        ipv4_cuup = "127.0.0.6";
+        ipv4_cucp = "192.168.68.194";
+        ipv4_cuup = "192.168.68.196";
       }
     )
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

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

@@ -162,8 +162,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_address = "127.0.0.5";
-    remote_n_address = "127.0.0.4";
+    local_n_address = "192.168.68.195";
+    remote_n_address = "192.168.68.194";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;

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

@@ -169,8 +169,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_address = "127.0.0.5";
-    remote_n_address = "127.0.0.4";
+    local_n_address = "192.168.68.195";
+    remote_n_address = "192.168.68.194";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;

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.130";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.130";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 

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

@@ -28,11 +28,11 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+      # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
       absoluteFrequencySSB                                          = 430590;
       dl_frequencyBand                                              = 66;
-      # this is 2150.43 MHz
-      dl_absoluteFrequencyPointA                                    = 430086;
+      # this is 2150 MHz
+      dl_absoluteFrequencyPointA                                    = 430002;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -53,8 +53,8 @@ gNBs =
   #uplinkConfigCommon
      #frequencyInfoUL
       ul_frequencyBand                                              = 66;
-      # this is 1750.43 MHz
-      ul_absoluteFrequencyPointA                                    = 350086;
+      # this is 1750 MHz
+      ul_absoluteFrequencyPointA                                    = 350002;
       #scs-SpecificCarrierList
       ul_offstToCarrier                                             = 0;
 # subcarrierSpacing

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

@@ -1,321 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
- ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
-
-    @include "neighbour-config.conf"
-    nr_cellid = 1;
-
- ////////// Physical parameters:
-
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-    min_rxtxtime = 6;
-      pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-      );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -96;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 14;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-     }
-
-    );
-
-    # Dedicated Serving Cell Configuration
-    servingCellConfigDedicated = ({
-    # BWP-Downlink
-      # BWP 1 Configuration
-        dl_bwp-Id_1 = 1;
-        dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        dl_bwp-Id_2 = 2;
-        dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        dl_bwp-Id_3 = 3;
-        dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp3_subcarrierSpacing = 1;
-
-      firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-      defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-      # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-      #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-      #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-      #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-    # UplinkConfig
-      # BWP-Uplink
-        # BWP 1 Configuration
-          ul_bwp-Id_1 = 1;
-          ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp1_subcarrierSpacing = 1;
-
-        # BWP 2 Configuration
-          ul_bwp-Id_2 = 2;
-          ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp2_subcarrierSpacing = 1;
-
-        # BWP 3 Configuration
-          ul_bwp-Id_3 = 3;
-          ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp3_subcarrierSpacing = 1;
-
-        firstActiveUplinkBWP-Id = 1;  #BWP-Id
-      }
-    );
-
-
-    # ------- SCTP definitions
-    SCTP : {
-       # Number of streams to use in input/output
-       SCTP_INSTREAMS  = 2;
-       SCTP_OUTSTREAMS = 2;
-     };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ( { ipv4 = "192.168.70.132"; });
-
-
-    NETWORK_INTERFACES : {
-	   GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129";
-	   GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129";
-	   GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = ({
-  local_rf       = "yes";
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-});
-
-THREAD_STRUCT = (
-  {
-    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-    parallel_config    = "PARALLEL_SINGLE_THREAD";
-    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-    worker_config      = "WORKER_ENABLE";
-  }
-);
-
-rfsimulator: {
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs"
-}
-
-security = {
-# preferred ciphering algorithms
-# the first one of the list that an UE supports in chosen
-# valid values: nea0, nea1, nea2, nea3
-	ciphering_algorithms = ( "nea0" );
-
-# preferred integrity algorithms
-# the first one of the list that an UE supports in chosen
-# valid values: nia0, nia1, nia2, nia3
-	integrity_algorithms = ( "nia2", "nia0" );
-
-# setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-# what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-	drb_ciphering = "yes";
-	drb_integrity = "no";
-};
-
-log_config : {
-	global_log_level                      ="info";
-	hw_log_level                          ="info";
-	phy_log_level                         ="info";
-	mac_log_level                         ="info";
-	rlc_log_level                         ="info";
-	pdcp_log_level                        ="info";
-	nr_rrc_log_level		                  ="info";
-	rrc_log_level                         ="info";
-	ngap_log_level                        ="debug";
-	f1ap_log_level                        ="debug";
-};

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

@@ -161,8 +161,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 

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

@@ -161,8 +161,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 

ci-scripts/conf_files/neighbour-config.conf

@@ -1,76 +0,0 @@
-neighbour_list = (
-  {
-    nr_cellid = 1;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xb00;
-        nr_cellid = 2;
-        physical_cellId = 0x002;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 216; mnc = 03; mnc_length = 2};
-        tracking_area_code = 2;
-      },
-      {
-        gNB_ID = 0xa00;
-        nr_cellid = 3;
-        physical_cellId = 0x003;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 3;
-      },
-      {
-        gNB_ID = 0xc00;
-        nr_cellid = 4;
-        physical_cellId = 0x004;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 4;
-      }
-  )
-  },
-  {
-    nr_cellid = 2;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe00;
-        nr_cellid = 1;
-        physical_cellId = 0x000;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 001; mnc = 01; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  }
- );
-
-
-nr_measurement_configuration = {
-  Periodical = {
-    enable = 1;
-    includeBeamMeasurements = 1;
-    maxNrofRS_IndexesToReport = 4;
-  };
-
-  A2 = {
-    enable = 1;
-    threshold = 60;
-    timeToTrigger = 1;
-  };
-
-  A3 = ({
-    cell_id = -1; #Default
-    offset = 10;
-    hysteresis = 0;
-    timeToTrigger = 1
-  }, {
-    cell_id = 2;
-    offset = 5;
-    hysteresis = 1;
-    timeToTrigger = 2
-  })
-};
-

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
-
 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/xml_files/container_sa_b200_quectel.xml

@@ -185,14 +185,14 @@
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="060002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
 

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -177,14 +177,14 @@
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="360002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment (on CU)</desc>
     <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
 

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -209,14 +209,14 @@
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="160002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment (on CU)</desc>
     <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
 

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -179,14 +179,14 @@
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
     <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="260002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
     <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
 

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

@@ -84,9 +84,8 @@ services:
 
     oai-cu:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-cu
-        cap_drop:
-            - ALL
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -105,15 +104,14 @@ services:
 
     oai-du:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim
                                     --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:
@@ -130,12 +128,8 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
@@ -143,14 +137,11 @@ 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:
             public_net:
                 ipv4_address: 192.168.71.181
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - ../../conf_files/rfsim_channel_ci.conf:/opt/oai-nr-ue/etc/rfsim_channel_ci.conf

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

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -102,12 +101,8 @@ services:
             retries: 5
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment: 
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -115,8 +110,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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_l2sim_tdd/docker-compose.yaml

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: "l2sim-oai-gnb"
-        cap_drop:
-            - ALL
         network_mode: "host"
         environment:
             TZ: Europe/Paris
@@ -103,9 +102,8 @@ services:
 
     proxy:
         image: oai-lte-multi-ue-proxy:latest
+        privileged: true
         container_name: "l2sim-proxy"
-        cap_drop:
-            - ALL
         network_mode: "host"
         environment:
             TZ: Europe/Paris
@@ -120,20 +118,14 @@ services:
 
     oai-nr-ue0:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: "l2sim-oai-nr-ue0"
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         network_mode: "host"
         environment:
             TZ: Europe/Paris
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
             ASAN_OPTIONS: detect_leaks=0
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results

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`.**
 
@@ -237,18 +237,12 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
 ```yaml
     oai-nr-ue2:
         image: oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         networks:
@@ -535,40 +529,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

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -102,12 +101,8 @@ services:
             retries: 5
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -115,8 +110,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -126,12 +119,8 @@ services:
             retries: 5
     oai-nr-ue2:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -139,8 +128,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.151
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -150,12 +137,8 @@ services:
             retries: 5
     oai-nr-ue3:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue3
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -163,8 +146,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.152
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -174,12 +155,8 @@ services:
             retries: 5
     oai-nr-ue4:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue4
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -187,8 +164,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.153
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -198,12 +173,8 @@ services:
             retries: 5
     oai-nr-ue5:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue5
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -211,8 +182,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.154
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -222,12 +191,8 @@ services:
             retries: 5
     oai-nr-ue6:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue6
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -235,8 +200,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.155
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -246,12 +209,8 @@ services:
             retries: 5
     oai-nr-ue7:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue7
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -259,8 +218,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.156
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -270,12 +227,8 @@ services:
             retries: 5
     oai-nr-ue8:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue8
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -283,8 +236,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.157
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -294,12 +245,8 @@ services:
             retries: 5
     oai-nr-ue9:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue9
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -307,8 +254,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.158
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -318,12 +263,8 @@ services:
             retries: 5
     oai-nr-ue10:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue10
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -331,8 +272,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.159
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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_24prb/docker-compose.yaml

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -102,12 +101,8 @@ services:
             retries: 5
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -115,8 +110,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -103,12 +102,8 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -116,8 +111,6 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf

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

@@ -1,9 +1,8 @@
 services:
     oai-du:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
         network_mode: "host"
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time
@@ -16,19 +15,13 @@ services:
             retries: 5
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         network_mode: "host"
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001140 --rfsimulator.serveraddr 127.0.0.1 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-du
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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

@@ -66,9 +66,8 @@ services:
 
     oai-cucp:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-cucp
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
@@ -93,9 +92,8 @@ services:
 
     oai-cuup:
         image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
         container_name: rfsim5g-oai-cuup
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
@@ -122,9 +120,8 @@ services:
 
     oai-cuup2:
         image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
         container_name: rfsim5g-oai-cuup2
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_CU_UP_ID 0xe01
@@ -154,9 +151,8 @@ services:
 
     oai-cuup3:
         image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
         container_name: rfsim5g-oai-cuup3
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_CU_UP_ID 0xe02
@@ -186,9 +182,8 @@ services:
 
     oai-du:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     --MACRLCs.[0].local_n_address 192.168.72.3
@@ -215,9 +210,8 @@ services:
 
     oai-du2:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-du2
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_DU_ID 0xe01
@@ -247,9 +241,8 @@ services:
 
     oai-du3:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-du3
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_DU_ID 0xe02
@@ -279,12 +272,8 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
@@ -295,8 +284,6 @@ services:
         networks:
             ue_net:
                 ipv4_address: 192.168.78.5
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -307,12 +294,8 @@ services:
 
     oai-nr-ue2:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
@@ -323,8 +306,6 @@ services:
         networks:
             ue_net:
                 ipv4_address: 192.168.78.6
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
@@ -335,12 +316,8 @@ services:
 
     oai-nr-ue3:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue3
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
@@ -352,8 +329,6 @@ services:
         networks:
             ue_net:
                 ipv4_address: 192.168.78.7
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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

@@ -1,20 +1,14 @@
 services:
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
-        devices:
-            - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf
             - rrc.config:/opt/oai-gnb/
@@ -26,17 +20,11 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
-        devices:
-            - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

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

@@ -83,9 +83,8 @@ services:
 
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -102,19 +101,13 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim
                                     --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73
             ASAN_OPTIONS: detect_leaks=0
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         depends_on:

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

@@ -1,20 +1,14 @@
 services:
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
-        devices:
-            - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf
             - rrc.config:/opt/oai-gnb/
@@ -26,17 +20,11 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
-        devices:
-            - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

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/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -82,9 +82,8 @@ services:
             retries: 5
     oai-gnb:
         image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
         container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -103,21 +102,15 @@ services:
 
     oai-nr-ue:
         image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
         container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
             public_net:
                 ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml

@@ -1,13 +1,9 @@
 services:
     oai-gnb:
         image: oai-gnb:latest
+        privileged: true
         network_mode: "host"
         container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         environment:
             TZ: Europe/Paris
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml

@@ -1,13 +1,9 @@
 services:
     oai-gnb:
         image: oai-gnb:latest
+        privileged: true
         network_mode: "host"
         container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         environment:
             TZ: Europe/Paris
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml

@@ -1,18 +1,14 @@
 services:
     oai-gnb:
         image: oai-gnb:latest
+        privileged: true
         network_mode: "host"
         container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 90 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:

ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml

@@ -1,23 +1,15 @@
 services:
     oai-nr-ue:
         image: oai-nr-ue:latest
+        privileged: true
         network_mode: host
         container_name: oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE   # for performance
-            - IPC_LOCK   # for memory locking
-        devices:
-             - /dev/net/tun:/dev/net/tun
         ulimits:
           core: -1 # for core dumps
         #entrypoint: /bin/bash -c "sleep infinity"
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 90 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111 --uicc0.nssai_sd 16777215
         volumes:
             - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:

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/nsa_b200_gnb/docker-compose.yml

@@ -1,21 +1,16 @@
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest
+        privileged: true
         container_name: nsa-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
             USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
         volumes:
             - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
+            - /dev:/dev
         networks:
             public_net:
                 ipv4_address: 192.168.68.194

ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml

@@ -1,13 +1,9 @@
 services:
     oai-gnb:
         image: oai-gnb-aw2s:latest
+        privileged: true
         network_mode: "host"
         container_name: oai-gnb-aw2s
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:

ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml

@@ -1,26 +1,19 @@
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
         volumes:
             - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -28,3 +21,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"

ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml

@@ -1,22 +1,17 @@
 services:
     gnb_cucp:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-cucp-gnb
-        cap_drop:
-            - ALL
         ulimits:
           core: -1 # for core dumps
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa
-                                    --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cucp.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
         healthcheck:
             # pgrep does NOT work
             test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
@@ -26,24 +21,17 @@ services:
 
     gnb_cuup:
         image: oai-nr-cuup:latest
+        privileged: true
         container_name: sa-cuup-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cuup.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.196
         healthcheck:
             # pgrep does NOT work
             test: /bin/bash -c "ps aux | grep -v grep | grep -c nr-cuup"
@@ -53,12 +41,8 @@ services:
 
     gnb_du_tdd:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-du-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
@@ -66,19 +50,16 @@ services:
             USE_ADDITIONAL_OPTIONS: --sa
                                     --RUs.[0].sdr_addrs serial=30C51D4
                                     --continuous-tx -E
-                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --telnetsrv --telnetsrv.shrmod ci
                                     --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1
                                     --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
                                     --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
         volumes:
             - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.195
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -86,3 +67,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"

ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml

@@ -1,22 +1,17 @@
 services:
     gnb_cu:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-cu-gnb
-        cap_drop:
-            - ALL
         ulimits:
           core: -1 # for core dumps
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa
-                                    --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cu.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -27,29 +22,19 @@ services:
 
     gnb_du_fdd:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-du-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx
-                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
-                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
         volumes:
             - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.195
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -57,3 +42,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

@@ -3,10 +3,13 @@
 # Check if cuBB_SDK is defined, if not, use default path
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
 
+# Run gdrcopy insmod
+cd "$cuBB_Path"/cuPHY-CP/external/gdrcopy/ || exit 1
+
+./insmod.sh
 cd "$cuBB_Path" || exit 1
 # Add gdrcopy to LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
-export LD_LIBRARY_PATH=$LD_LIBRART_PATH:"$cuBB_Path/gpu-dpdk/build/install/lib/x86_64-linux-gnu:$cuBB_Path/build/cuPHY-CP/cuphydriver/src"
 
 # Restart MPS
 # Export variables
@@ -18,18 +21,17 @@ export CUDA_MPS_LOG_DIRECTORY=/var
 echo quit | nvidia-cuda-mps-control
 
 # Start MPS
-sudo -E nvidia-cuda-mps-control -d
-sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
+nvidia-cuda-mps-control -d
+echo start_server -uid 0 | nvidia-cuda-mps-control
 
 # Start cuphycontroller_scf
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
     # No argument provided, use default value
-    argument="P5G_FXN"
+    argument="P5G_SCF_FXN"
 else
     # Argument provided, use it
     argument="$1"
 fi
 
-sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
+"$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -23,10 +23,10 @@ services:
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:24-1
+    image: cubb-build:23-2
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
+    command: bash -c " rm -rf /tmp/phy.log && chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
     healthcheck:
       test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
       interval: 20s
@@ -38,11 +38,7 @@ services:
     depends_on:
       nv-cubb:
         condition: service_healthy
-    cap_drop:
-      - ALL
-    cap_add:
-      - SYS_NICE
-      - IPC_LOCK
+    privileged: true
     ipc: "container:nv-cubb"
     environment:
       USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml

@@ -1,26 +1,19 @@
 services:
     gnb_mono_tdd:
         image: oai-gnb:latest
+        privileged: true
         container_name: sa-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
             USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function -E
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -28,3 +21,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"

cmake_targets/autotests/run_exec_autotests.bash

@@ -30,6 +30,7 @@ fi
 
 source $OPENAIR_DIR/cmake_targets/tools/test_helper
 
+SUDO="sudo -E"
 tdir=$OPENAIR_DIR/cmake_targets/autotests
 rm -fr $tdir/bin
 mkdir -p $tdir/bin
@@ -177,6 +178,8 @@ RUN_GROUP=0
 test_case_group=""
 test_case_group_array=()
 test_case_array=()
+echo_info "Note that the user should be sudoer for executing certain commands, for example loading kernel modules"
+
 
 until [ -z "$1" ]; do
   case "$1" in
@@ -204,6 +207,15 @@ until [ -z "$1" ]; do
   esac
 done
 
+tmpfile=`mktemp`
+$SUDO echo $HOME > $tmpfile
+tstsudo=`cat $tmpfile`
+if [ "$tstsudo" != "$HOME" ]; then
+  echo_error "$USER does not have sudo privileges. Exiting"
+  exit
+fi
+rm -fr $tmpfile
+
 test_case_excl_list=`xmlstarlet sel -t -v "/testCaseList/TestCaseExclusionList" $xml_conf`
 test_case_excl_list=`sed "s/\+/\*/g" <<< "$test_case_excl_list" ` # Replace + with * for bash string substituion
 echo "Test Case Exclusion List = $test_case_excl_list "

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

@@ -52,7 +52,7 @@ 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]
@@ -124,8 +124,6 @@ Options:
 --disable-cpu-affinity
    Disables CPU Affinity between UHD/TX/RX Threads (Valid only when deadline scheduler is disabled). By defaulT, CPU Affinity is enabled when not using deadline scheduler. It is enabled only with >2 CPUs. For eNB, CPU_0-> Device library (UHD), CPU_1->TX Threads, CPU_2...CPU_MAX->Rx Threads. For UE, CPU_0->Device Library(UHD), CPU_1..CPU_MAX -> All the UE threads
 --enable-cpu-affinity
---enable-LTTNG
-   Enable LTTNG log. While lttng is enabled, T-Tracer will be disabled
 --disable-T-Tracer
    Disables the T tracer.
 --disable-hardware-dependency
@@ -271,6 +269,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")
@@ -352,11 +353,6 @@ function main() {
            BUILD_DOXYGEN=1
            echo_info "Will build doxygen support"
            shift;;     
-       --enable-LTTNG)
-            CMAKE_CMD="$CMAKE_CMD -DENABLE_LTTNG=ON -DT_TRACER=OFF"
-            echo_info "Enable LTTNG tracer"
-            USE_LTTNG=1
-            shift 1;;
        --disable-T-Tracer)
             CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
             echo_info "Disabling the T tracer"
@@ -415,21 +411,22 @@ 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)
+        --sanitize-undefined | -fundefined=address)
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_UNDEFINED=True"
             shift;;
         --sanitize-memory | -fsanitize=memory)
             CMAKE_CMD="$CMAKE_CMD -DSANITIZE_MEMORY=ON -DSANITIZE_ADDRESS=OFF -DSANITIZE_UNDEFINED=OFF"
             shift;;
-        --sanitize-thread | -fsanitize=thread)
-            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
-            shift;;
        --trace-asn1c-enc-dec)
             CMAKE_CMD="$CMAKE_CMD -DTRACE_ASN1C_ENC_DEC=ON"
             echo_info "Enabling asn1c internal traces via OAI logging system"
             shift 1;;
+        --sanitize-thread | -fthread=address)
+            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
+            shift;;
         -h | --help)
             print_help
             exit 1;;
@@ -457,10 +454,6 @@ function main() {
   if [ "$INSTALL_EXTERNAL" = "1" ] ; then
     echo_info "Installing packages"
     check_install_oai_software
-    if [ "$USE_LTTNG" = "1" ] ; then
-      echo_info "installing LTTng"
-      install_lttng $1
-    fi
     if [ "$HW" == "OAI_USRP" ] ; then
       echo_info "installing packages for USRP support"
       check_install_usrp_uhd_driver
@@ -549,15 +542,22 @@ function main() {
   # Auto-tests #
   ##############
   if [ "$OAI_TEST" = "1" ] ; then
+    echo_error "These scripts ASSUME that user is in /etc/sudoers and can execute commands without PASSWORD prompt"
+    echo_error "Add the following lines in /etc/sudoers file to make your __user_name__ sudo without password prompt"
+    echo_error " __your_user_name__ ALL = (ALL:ALL) NOPASSWD: ALL"
+    echo_error " __your_user_name__ ALL = (ALL) NOPASSWD: ALL "
     echo_info "The log file for the autotest script for debugging is located here: $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log "
     echo_info "The results of autotests results is located here: $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml "
     echo_info "You can hit CTRL-C at any time to terminate the autotests..."
+    echo "Current User Name: $USER"
+    read -s -p "Enter Password: " mypassword
+    echo -e "\n"
     rm -fr $OPENAIR_DIR/cmake_targets/autotests/log
     mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
     if [ "$RUN_GROUP" -eq "1" ]; then
-        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log
+        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" -p $mypassword >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
     else
-        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log
+        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -p $mypassword >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
     fi
     wait
   else

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() {
@@ -317,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)
@@ -347,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
@@ -524,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"
             ;;
@@ -569,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"
             ;;
@@ -581,6 +602,7 @@ check_install_oai_software() {
         ninja-build \
 	pkg-config \
 	git \
+	libatlas-base-dev \
 	libblas-dev \
 	liblapack-dev \
 	liblapacke-dev \
@@ -610,6 +632,7 @@ check_install_oai_software() {
       gcc \
       gcc-c++ \
       git \
+      atlas-devel \
       pkgconfig \
       libconfig-devel \
       libffi-devel \
@@ -644,10 +667,7 @@ install_asn1c_from_source(){
     # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
     git clone https://github.com/mouse07410/asn1c /tmp/asn1c
     cd /tmp/asn1c
-    #git checkout vlm_master
-    # hotfix: current vlm_master (5fa129cf3161da9ff2d67341e6277e818c0f5d6a)
-    # breaks F1, NG, so use the one before.
-    git checkout 940dd5fa9f3917913fd487b13dfddfacd0ded06e
+    git checkout vlm_master
     # Showing which version is used
     git log -n1
     autoreconf -iv
@@ -681,97 +701,6 @@ install_simde_from_source(){
     $SUDO \cp -rv ../simde /usr/include
 }
 
-install_lttng() {
-    if [[ "$OS_DISTRO" != "ubuntu" ]]; then
-      echo_info "LTTng is supported only for ubuntu at the moment."
-      echo_info $distribution
-      return
-    fi
-
-    set +e
-    $SUDO apt-add-repository ppa:lttng/stable-2.13 -y && apt-get update
-    $SUDO apt-get install -y lttng-tools lttng-modules-dkms liblttng-ust-dev
-    if [[ $? > 0 ]]; then
-      echo "Failed to install LTTng using apt. Installing from source"
-      install_lttng_deps
-      install_lttng_from_source
-    fi
-    set -e
-}
-
-install_lttng_deps() {
-  echo "installing dependencies of LTTng"
-  $SUDO apt-get install uuid-dev libxml2-dev -y
-}
-
-install_lttng_from_source() {
-    echo "installing LTTng from source"
-    install_popt_1_18_from_source
-    install_userspace_rcu
-    install_lttng_ust_2_13_from_source
-    install_lttng_tools_2_13_from_source
-}
-
-install_popt_1_18_from_source() {
-  $SUDO $INSTALLER -y install wget
-  echo_info "\nInstalling popt_1_18."
-  cd $(mktemp -d) &&
-  wget http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
-  tar -xf popt-1.18.tar.gz && cd popt-1.18
-  ./configure && make -j16 && $SUDO make install
-}
-
-install_userspace_rcu() {
-    echo_info "\nInstalling U-RCU from source."
-    cd /tmp
-    $SUDO rm -rf /tmp/urcu
-    git clone https://github.com/urcu/userspace-rcu.git /tmp/urcu
-    cd /tmp/urcu
-    git checkout stable-0.12
-    ./bootstrap && ./configure && make
-    $SUDO make install
-    $SUDO ldconfig
-}
-
-
-install_lttng_modules_2_13_from_source() {
-    $SUDO $INSTALLER -y install wget
-    echo_info "\nInstalling LTTng Modules."
-    cd $(mktemp -d) &&
-    wget https://lttng.org/files/lttng-modules/lttng-modules-latest-2.13.tar.bz2 &&
-    tar -xf lttng-modules-latest-2.13.tar.bz2 &&
-    cd lttng-modules-2.13.* &&
-    make &&
-    $SUDO make modules_install &&
-    $SUDO depmod -a
-}
-
-install_lttng_ust_2_13_from_source() {
-    $SUDO $INSTALLER -y install wget
-    echo_info "\nInstalling LTTng UST."
-    cd $(mktemp -d) &&
-    wget https://lttng.org/files/lttng-ust/lttng-ust-latest-2.13.tar.bz2 &&
-    tar -xf lttng-ust-latest-2.13.tar.bz2 &&
-    cd lttng-ust-2.13.* &&
-    ./configure --disable-numa &&
-    make &&
-    $SUDO make install &&
-    $SUDO ldconfig
-}
-
-install_lttng_tools_2_13_from_source() {
-    $SUDO $INSTALLER -y install wget
-    echo_info "\nInstalling LTTng Tools."
-    cd $(mktemp -d) &&
-    wget https://lttng.org/files/lttng-tools/lttng-tools-latest-2.13.tar.bz2 &&
-    tar -xf lttng-tools-latest-2.13.tar.bz2 &&
-    cd lttng-tools-2.13.* &&
-    ./configure &&
-    make &&
-    $SUDO make install &&
-    $SUDO ldconfig
-}
-
 #################################################
 # 2. compile
 ################################################

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

@@ -69,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/config/config_common.c

@@ -141,7 +141,7 @@ int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoption
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->i64ptr), 1);
 
   if (((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    *(cfgoptions->u64ptr) = cfgoptions->defint64val;
+    *(cfgoptions->u64ptr) = cfgoptions->defuintval;
     status=1;
     printf_params(cfg,
                   "[CONFIG] %s.%s set to default value %llu\n",

common/config/config_load_configmodule.c

@@ -208,11 +208,9 @@ int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions
     }
   } /* for loop on options */
 
-  printf_params(cfg,
-                "[CONFIG] %s: %i/%i parameters successfully set \n",
-                prefix == NULL ? "(root)" : prefix,
-                numdefvals,
-                numoptions);
+  printf("[CONFIG] %s: %i/%i parameters successfully set \n",
+         ((prefix == NULL)?"(root)":prefix),
+         numdefvals,numoptions );
 
   if (fatalerror == 1) {
     fprintf(stderr,"[CONFIG] fatal errors found when assigning %s parameters \n",
@@ -343,20 +341,9 @@ configmodule_interface_t *load_configmodule(int argc,
       atoken = strtok_r(NULL,":",&strtokctx);
     }
 
+    printf("[CONFIG] get parameters from %s ", cfgmode);
     for (i = 0; i < cfgptr->num_cfgP; i++) {
-      /* check if that file actually exists */
-      if (access(cfgptr->cfgP[i], F_OK) != 0) {
-        fprintf(stderr, "error: file %s does not exist\n", cfgptr->cfgP[i]);
-        for (int j = 0; j < cfgptr->num_cfgP; ++j)
-          free(cfgptr->cfgP[j]);
-        free(modeparams);
-        free(cfgptr->cfgmode);
-        free(cfgptr->argv_info);
-        free(cfgptr);
-        if (cfgmode != NULL)
-          free(cfgmode);
-        return NULL;
-      }
+      printf("%s ", cfgptr->cfgP[i]);
     }
 
   if (cfgptr->rtflags & CONFIG_PRINTPARAMS) {

common/config/libconfig/config_libconfig.c

@@ -70,7 +70,7 @@ int read_strlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, config_s
     str=config_setting_get_string_elem(setting,i);
 
     if (str==NULL) {
-      printf_params(cfg, "[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
+      printf("[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
     } else {
       snprintf(cfgoptions->strlistptr[i], DEFAULT_EXTRA_SZ, "%s",str);
       st++;
@@ -481,12 +481,9 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
     }
   } /* for loop on options */
 
-  printf_params(cfg,
-                "[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
-                prefix == NULL ? "(root)" : prefix,
-                status,
-                numoptions,
-                numdefvals);
+  printf("[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
+         ((prefix == NULL)?"(root)":prefix),
+         status,numoptions,numdefvals );
 
   if (fatalerror == 1) {
     fprintf(stderr,"[LIBCONFIG] fatal errors found when processing  %s \n", libconfig_privdata.configfile );
@@ -520,7 +517,8 @@ int config_libconfig_getlist(configmodule_interface_t *cfg,
     status = ParamList->numelt = config_setting_length(setting);
     printf_params(cfg, "[LIBCONFIG] %i %s in config file %s \n", ParamList->numelt, listpath, libconfig_privdata.configfile);
   } else {
-    printf_params(cfg, "[LIBCONFIG] list %s not found in config file %s \n", listpath, libconfig_privdata.configfile);
+    printf("[LIBCONFIG] list %s not found in config file %s \n",
+           listpath,libconfig_privdata.configfile );
     ParamList->numelt= 0;
     status = -1;
   }
@@ -576,10 +574,8 @@ int config_libconfig_init(configmodule_interface_t *cfg)
    config_set_auto_convert (&(libconfig_privdata.cfg), CONFIG_TRUE);
   /* Read the file. If there is an error, report it and exit. */
   if( config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile) == CONFIG_FALSE) {
-    fprintf(stderr,
-            "[LIBCONFIG] file %s - line %d: %s\n",
-            libconfig_privdata.configfile,
-            config_error_line(&(libconfig_privdata.cfg)),
+    fprintf(stderr,"[LIBCONFIG] %s %d file %s - line %d: %s\n",__FILE__, __LINE__,
+            libconfig_privdata.configfile, config_error_line(&(libconfig_privdata.cfg)),
             config_error_text(&(libconfig_privdata.cfg)));
     config_destroy(&(libconfig_privdata.cfg));
     printf( "\n");

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)
-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/DOC/log.md

@@ -15,6 +15,5 @@ By default, this facility is included at build-time and activated at run-time. T
 * [runtime usage](rtusage.md)
 * [developer usage](devusage.md)
 * [module architecture](arch.md)
-* [lttng usage](lttng_logs.md)
 
 [oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)

common/utils/LOG/DOC/lttng_logs.md

@@ -1,153 +0,0 @@
-# OAI gNB LTTng Tracing Setup Guide
-
-## Overview
-
-This guide will walk you through setting up tracing for an OpenAirInterface (OAI) gNB (gNodeB) using LTTng (Linux Trace Toolkit Next Generation) and Babeltrace.
-### What is LTTng and Why Use It?
-
-LTTng, or Linux Trace Toolkit Next Generation, is a powerful logging framework designed for Linux systems. It provides low-overhead tracing capabilities, allowing developers to monitor and analyze system behavior in real-time without significant performance impact. LTTng offers several advantages:
-
-- **Low Overhead**: LTTng introduces minimal overhead to the system, making it suitable for use in production environments without affecting system performance.
-
-- **Customizable**: LTTng allows users to define custom tracepoints in their applications, providing fine-grained control over what events to trace and collect.
-
-- **Scalability**: It can scale to large distributed systems, making it suitable for tracing complex software stacks across multiple nodes.
-
-## Prerequisites
-
-- Ubuntu system
-
-Note: only LTTng 2.3.8 is supported.
-
-## Building OAI gNB
-
-1. **Clean and Build OAI gNB with LTTng:**
-
-    1.1  Install Dependencies
-
-    ```bash
-    ./build_oai --ninja -I --clean --enable-LTTNG
-    
-    ```
-    1.2  Build gNB and nrUE
-    ```
-    ./build_oai --ninja --gNB --nrUE -w SIMU --enable-LTTNG
-    ```
-## Setting up LTTng
-
-1. **Start LTTng Session and Relay:**
-
-    ```bash
-    sudo lttng-sessiond -d
-    sudo lttng-relayd -d
-    ```
-
-2. **Create Live LTTng Session:**
-
-    ```bash
-    sudo lttng create my-session --live --set-url=net://127.0.0.1
-    ```
-
-3. **Enable gNB Trace Events:**
-
-    ```bash
-    sudo lttng enable-event --userspace OAI:gNB
-    ```
-
-4. **Start LTTng Tracing:**
-
-    ```bash
-    sudo lttng start
-    ```
-
-## Running the gNB
-
-1. **Run gNB:**
-
-    ```bash
-    ./$binary_path -O $configuration_file PARALLEL_SINGLE_THREAD --rfsimulator.serveraddr server --rfsim --sa -E
-    ```
-
-## Verifying Tracepoints
-
-1. **List Active Tracepoints:**
-
-    ```bash
-    sudo lttng list -u
-    ```
-
-    *Possible Output:*
-
-    ```
-    UST events:
-    -------------
-    
-    PID: 1154722 - Name: /home/firecell/Desktop/FirecellRepos/firecellrd-oai5g-ran/cmake_targets/ran_build/build/nr-softmodem
-          OAI:gNB (loglevel: TRACE_DEBUG_FUNCTION (12)) (type: tracepoint)
-    ```
-
-## Analyzing Traces
-
-1. **Install Babeltrace:**
-
-    ```bash
-    sudo apt-get install babeltrace
-    ```
-
-
-2. **Capture Trace Logs Live:**
-
-    - To learn the full path of the trace session:
-    
-        ```bash
-        babeltrace --input-format=lttng-live net://localhost
-        ```
-
-    - Trace logs using the full path:
-    
-        ```bash
-        babeltrace --input-format=lttng-live net://localhost/host/firecell-XPS-15-9530/my-session
-        ```
-
-    *Possible Output:*
-
-    ```
-    [19:35:32.181608002] (+2.664882127) firecell-XPS-15-9530 OAI:gNB: { cpu_id = 10 }, { MODNAME = "OAI-NR_MAC info", EVENTID = -1, SFN = -1, SLOT = -1, FUNCTION = "gNB_dlsch_ulsch_scheduler", LINE = 246, MSG = "Frame.Slot 0.0\n" }
-    ```
-3. **Capture Trace Logs Offline:**
-
-    - Create an offline trace session with a specified output directory:
-
-        ```bash
-        sudo lttng create offline_session --output=/home/trace_offline/
-        ```
-
-    - Enable gNB trace events:
-
-        ```bash
-        sudo lttng enable-event --userspace OAI:gNB
-        ```
-
-    - Start capturing trace logs:
-
-        ```bash
-        sudo lttng start
-        ```
-
-    - Stop the trace capture:
-
-        ```bash
-        sudo lttng stop
-        ```
-
-    - Destroy the trace session:
-
-        ```bash
-        sudo lttng destroy
-        ```
-
-    - Use Babeltrace to analyze the captured trace logs:
-
-        ```bash
-        sudo babeltrace /home/trace_offline/
-        ```

common/utils/LOG/log.c

@@ -603,25 +603,6 @@ void logRecord_mt(const char *file,
   log_output_memory(c, file,func,line,comp,level,format,args);
   va_end(args);
 }
-#if ENABLE_LTTNG
-void logRecord_lttng(const char *file, const char *func, int line, int comp, int level, const char *format, ...)
-{
-  log_component_t *c = &g_log->log_component[comp];
-  char header[48];
-  char buf[MAX_LOG_TOTAL];
-  va_list args;
-  va_start(args, format);
-  vsnprintf(buf, sizeof(buf) - 1, format, args);
-  va_end(args);
-
-  if (map_int_to_str(log_level_names, level) != NULL)
-    snprintf(header, sizeof(header), "OAI-%s %s", c->name, map_int_to_str(log_level_names, level));
-  else
-    snprintf(header, sizeof(header), "OAI-%s", c->name);
-
-  LOG_FC(header, func, line, buf);
-}
-#endif
 
 void vlogRecord_mt(const char *file,
 		   const char *func,

common/utils/LOG/log.h

@@ -28,7 +28,7 @@
 */
 
 #ifndef __LOG_H__
-#define __LOG_H__
+#    define __LOG_H__
 
 /*--- INCLUDES ---------------------------------------------------------------*/
 #include <unistd.h>
@@ -52,9 +52,6 @@
 #endif
 #include <pthread.h>
 #include <common/utils/utils.h>
-#if ENABLE_LTTNG
-#include "lttng-log.h"
-#endif
 /*----------------------------------------------------------------------------*/
 #include <assert.h>
 #ifdef NDEBUG
@@ -237,10 +234,6 @@ void logTerm (void);
 int  isLogInitDone (void);
 void logRecord_mt(const char *file, const char *func, int line,int comp, int level, const char *format, ...) __attribute__ ((format (printf, 6, 7)));
 void vlogRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, va_list args );
-#if ENABLE_LTTNG
-void logRecord_lttng(const char *file, const char *func, int line, int comp, int level, const char *format, ...)
-    __attribute__((format(printf, 6, 7)));
-#endif
 void log_dump(int component, void *buffer, int buffsize,int datatype, const char *format, ... );
 int  set_log(int component, int level);
 void set_glog(int level);
@@ -432,50 +425,9 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
 
 /* define variable only used in LOG macro's */
 #define LOG_VAR(A, B) A B
-#else /* T_TRACER */
-#if ENABLE_LTTNG
-#define LOG_E(c, x...)                                                     \
-  do {                                                                     \
-    if (g_log->log_component[c].level >= OAILOG_ERR) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_ERR, x); \
-    }                                                                      \
-  } while (0)
-#define LOG_W(c, x...)                                                         \
-  do {                                                                         \
-    if (g_log->log_component[c].level >= OAILOG_WARNING) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_WARNING, x); \
-    }                                                                          \
-  } while (0)
-#define LOG_A(c, x...)                                                          \
-  do {                                                                          \
-    if (g_log->log_component[c].level >= OAILOG_ANALYSIS) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_ANALYSIS, x); \
-    }                                                                           \
-  } while (0)
-#define LOG_I(c, x...)                                                      \
-  do {                                                                      \
-    if (g_log->log_component[c].level >= OAILOG_INFO) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_INFO, x); \
-    }                                                                       \
-  } while (0)
-#define LOG_D(c, x...)                                                       \
-  do {                                                                       \
-    if (g_log->log_component[c].level >= OAILOG_DEBUG) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_DEBUG, x); \
-    }                                                                        \
-  } while (0)
-#define LOG_T(c, x...)                                                       \
-  do {                                                                       \
-    if (g_log->log_component[c].level >= OAILOG_TRACE) {                     \
-      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_TRACE, x); \
-    }                                                                        \
-  } while (0)
-#define LOG_DDUMP(c, b, s, f, x...)                    \
-  do {                                                 \
-    if (g_log->log_component[c].level >= OAILOG_DEBUG) \
-      log_dump(c, b, s, f, x);                         \
-  } while (0)
-#else
+
+#else /* no T_TRACER */
+
 #define LOG_E(c, x...)                                                  \
   do {                                                                  \
     if (g_log->log_component[c].level >= OAILOG_ERR)                    \
@@ -517,7 +469,6 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
     if (g_log->log_component[c].level >= OAILOG_TRACE)                    \
       logRecord_mt(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_TRACE, x); \
   } while (0)
-#endif
 
 #define VLOG(c, l, f, args)                                           \
   do {                                                                \
@@ -526,8 +477,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

@@ -4,11 +4,6 @@ ID = ENB_MASTER_TICK
     GROUP = ALL:GENERAL:ENB
     FORMAT = int,eNB_ID : int,frame : int,subframe
 
-ID = USRP_RX_ANT0
-    DESC = RX IQ data as received 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/alg/find.c

@@ -40,7 +40,7 @@ elm_arr_t find_if_arr_it(seq_arr_t* arr, void* start_it, void* end_it, void* val
   return (elm_arr_t){.found = false, .it = NULL};
 }
 
-elm_arr_t find_if(seq_arr_t* arr, void* value, bool (*f)(const void*, const void*))
+elm_arr_t find_if_arr(seq_arr_t* arr, void* value, bool (*f)(const void*, const void*))
 {
   assert(arr != NULL);
   void* start_it = seq_arr_front(arr);

common/utils/alg/find.h

@@ -42,7 +42,7 @@ typedef struct {
  * @param f Function representing the predicate
  * @return Whether the predicate was fullfilled and the iterator to the element if true
  */
-elm_arr_t find_if(seq_arr_t* arr, void* value, bool (*f)(const void* value, const void* it));
+elm_arr_t find_if_arr(seq_arr_t* arr, void* value, bool (*f)(const void* value, const void* it));
 
 /**
  * @brief Find elements in an array in the semi-open range [start_it, end_it)

common/utils/ds/tests/test_seq_array.c

@@ -52,7 +52,7 @@ int main()
 
   // Find element in the array
   int value = 50;
-  elm_arr_t elm = find_if(&arr, &value, eq_int);
+  elm_arr_t elm = find_if_arr(&arr, &value, eq_int);
   assert(elm.found == true);
   // Check
   assert(*(int*)elm.it == 50);

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

@@ -182,123 +182,6 @@ const nr_bandentry_t nr_bandtable[] = {
   {261,27500040,28350000,27500040,28350000,  2,2070833, 120}
 };
 
-// synchronization raster per band tables (Rel.15)
-// (38.101-1 Table 5.4.3.3-1 and 38.101-2 Table 5.4.3.3-1)
-// band nb, sub-carrier spacing index, Range of gscn (First, Step size, Last)
-// clang-format off
-const sync_raster_t sync_raster[] = {
-  {1, 0, 5279, 1, 5419},
-  {2, 0, 4829, 1, 4969},
-  {3, 0, 4517, 1, 4693},
-  {5, 0, 2177, 1, 2230},
-  {5, 1, 2183, 1, 2224},
-  {7, 0, 6554, 1, 6718},
-  {8, 0, 2318, 1, 2395},
-  {12, 0, 1828, 1, 1858},
-  {13, 0, 1871, 1, 1885},
-  {14, 0, 1901, 1, 1915},
-  {18, 0, 2156, 1, 2182},
-  {20, 0, 1982, 1, 2047},
-  {24, 0, 3818, 1, 3892},
-  {24, 1, 3824, 1, 3886},
-  {25, 0, 4829, 1, 4981},
-  {26, 0, 2153, 1, 2230},
-  {28, 0, 1901, 1, 2002},
-  {29, 0, 1798, 1, 1813},
-  {30, 0, 5879, 1, 5893},
-  {34, 0, 5030, 1, 5056},
-  {34, 1, 5036, 1, 5050},
-  {38, 0, 6431, 1, 6544},
-  {38, 1, 6437, 1, 6538},
-  {39, 0, 4706, 1, 4795},
-  {39, 1, 4712, 1, 4789},
-  {40, 1, 5762, 1, 5989},
-  {41, 0, 6246, 3, 6717},
-  {41, 1, 6252, 3, 6714},
-  {48, 1, 7884, 1, 7982},
-  {50, 0, 3584, 1, 3787},
-  {51, 0, 3572, 1, 3574},
-  {53, 0, 6215, 1, 6232},
-  {53, 1, 6221, 1, 6226},
-  {65, 0, 5279, 1, 5494},
-  {66, 0, 5279, 1, 5494},
-  {66, 1, 5285, 1, 5488},
-  {67, 0, 1850, 1, 1888},
-  {70, 0, 4993, 1, 5044},
-  {71, 0, 1547, 1, 1624},
-  {74, 0, 3692, 1, 3790},
-  {75, 0, 3584, 1, 3787},
-  {76, 0, 3572, 1, 3574},
-  {77, 1, 7711, 1, 8329},
-  {78, 1, 7711, 1, 8051},
-  {79, 1, 8480, 16, 8880},
-  {85, 0, 1826, 1, 1858},
-  {90, 1, 6252, 1, 6714},
-  {91, 0, 3572, 1, 3574},
-  {92, 0, 3584, 1, 3787},
-  {93, 0, 3572, 1, 3574},
-  {94, 0, 3584, 1, 3587},
-  {257, 3, 22388, 1, 22558},
-  {257, 4, 22390, 2, 22556},
-  {258, 3, 22257, 1, 22443},
-  {258, 4, 22258, 2, 22442},
-  {260, 3, 22995, 1, 23166},
-  {260, 4, 22996, 2, 23164},
-  {261, 3, 22446, 1, 22492},
-  {261, 4, 22446, 2, 22490},
-};
-// clang-format on
-
-// Section 5.4.3 of 38.101-1 and -2
-void check_ssb_raster(uint64_t freq, int band, int scs)
-{
-  int start_gscn = 0, step_gscn = 0, end_gscn = 0;
-  for (int i = 0; i < sizeof(sync_raster) / sizeof(sync_raster_t); i++) {
-    if (sync_raster[i].band == band && sync_raster[i].scs_index == scs) {
-      start_gscn = sync_raster[i].first_gscn;
-      step_gscn = sync_raster[i].step_gscn;
-      end_gscn = sync_raster[i].last_gscn;
-      break;
-    }
-  }
-  AssertFatal(start_gscn != 0, "Couldn't find band %d with SCS %d\n", band, scs);
-  int gscn;
-  if (freq < 3000000000) {
-    int N = 0;
-    int M = 0;
-    for (int k = 0; k < 3; k++) {
-      M = (k << 1) + 1;
-      if ((freq - M * 50000) % 1200000 == 0) {
-        N = (freq - M * 50000) / 1200000;
-        break;
-      }
-    }
-    AssertFatal(N != 0, "SSB frequency %lu Hz not on the synchronization raster (N * 1200kHz + M * 50 kHz)\n", freq);
-    gscn = (3 * N) + (M - 3) / 2;
-  } else if (freq < 24250000000) {
-    AssertFatal((freq - 3000000000) % 1440000 == 0,
-                "SSB frequency %lu Hz not on the synchronization raster (3000 MHz + N * 1.44 MHz)\n",
-                freq);
-    gscn = ((freq - 3000000000) / 1440000) + 7499;
-  } else {
-    AssertFatal((freq - 24250080000) % 17280000 == 0,
-                "SSB frequency %lu Hz not on the synchronization raster (24250.08 MHz + N * 17.28 MHz)\n",
-                freq);
-    gscn = ((freq - 24250080000) / 17280000) + 22256;
-  }
-  AssertFatal(gscn >= start_gscn && gscn <= end_gscn,
-              "GSCN %d corresponding to SSB frequency %lu does not belong to GSCN range for band %d\n",
-              gscn,
-              freq,
-              band);
-  int rel_gscn = gscn - start_gscn;
-  AssertFatal(rel_gscn % step_gscn == 0,
-              "GSCN %d corresponding to SSB frequency %lu not in accordance with GSCN step for band %d\n",
-              gscn,
-              freq,
-              band);
-}
-
 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);
@@ -356,8 +239,8 @@ bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_
 
   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) (band_size_khz) / (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)
@@ -389,10 +272,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;
 }
@@ -644,9 +524,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;
 }
 
@@ -657,7 +544,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;
 }
@@ -1023,132 +910,6 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
   return ssb_offset_point_a;
 }
 
-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);
-}
-
-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);
-}
-
-static void compute_M_and_N(const int gscn, int *rM, int *rN)
-{
-  if (gscn > 1 && gscn < 7499) {
-    for (int M = 1; M < 6; M += 2) {
-      /* GSCN = 3N + (M-3) / 2
-         N(int) = 2 * GSCN + 3 - M
-      */
-      if (((2 * gscn + 3 - M) % 6) == 0) {
-        *rM = M;
-        *rN = (2 * gscn + 3 - M) / 6;
-        break;
-      }
-    }
-  } else if (gscn > 7498 && gscn < 22256) {
-    *rN = gscn - 7499;
-  } else if (gscn > 22255 && gscn < 26638) {
-    *rN = gscn - 22256;
-  } else {
-    LOG_E(NR_PHY, "Invalid GSCN\n");
-    abort();
-  }
-}
-
-// Section 5.4.3 of 38.101-1 and -2
-static double get_ssref_from_gscn(const int gscn)
-{
-  int M, N = -1;
-  compute_M_and_N(gscn, &M, &N);
-  if (gscn > 1 && gscn < 7499) { // Sub 3GHz
-    AssertFatal(N > 0 && N < 2500, "Invalid N\n");
-    AssertFatal(M > 0 && M < 6 && (M & 0x1), "Invalid M\n");
-    return (N * 1200e3 + M * 50e3);
-  } else if (gscn > 7498 && gscn < 22256) {
-    AssertFatal(N > -1 && N < 14757, "Invalid N\n");
-    return (3000e6 + N * 1.44e6);
-  } else if (gscn > 22255 && gscn < 26638) {
-    AssertFatal(N > -1 && N < 4382, "Invalid N\n");
-    return (24250.08e6 + N * 17.28e6);
-  } else {
-    LOG_E(NR_PHY, "Invalid GSCN\n");
-    abort();
-  }
-}
-
-static void find_gscn_to_scan(const double startFreq,
-                              const double stopFreq,
-                              const sync_raster_t gscn,
-                              int *scanGscnStart,
-                              int *scanGscnStop)
-{
-  const double scs = MU_SCS(gscn.scs_index) * 1e3;
-  const double ssbBW = 20 * NR_NB_SC_PER_RB * scs;
-
-  for (int g = gscn.first_gscn; g < gscn.last_gscn; g += gscn.step_gscn) {
-    const double centerSSBFreq = get_ssref_from_gscn(g);
-    const double startSSBFreq = centerSSBFreq - ssbBW / 2;
-    if (startSSBFreq < startFreq)
-      continue;
-
-    *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);
-    const double stopSSBFreq = centerSSBFreq + ssbBW / 2 - 1;
-    if (stopSSBFreq > stopFreq)
-      continue;
-
-    *scanGscnStop = g;
-    break;
-  }
-}
-
-static int get_ssb_first_sc(const double pointA, const double ssbCenter, const int mu)
-{
-  const double scs = MU_SCS(mu) * 1e3;
-  const int ssbRBs = 20;
-  return (int)((ssbCenter - pointA) / scs - (ssbRBs / 2 * NR_NB_SC_PER_RB));
-}
-
-/* Returns array of first SCS offset in the scanning window */
-int get_scan_ssb_first_sc(const double fc, const int nbRB, const int nrBand, const int mu, nr_gscn_info_t ssbInfo[MAX_GSCN_BAND])
-{
-  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;
-  }
-
-  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);
-  int numGscn = 0;
-  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;
-    numGscn++;
-  }
-
-  return numGscn;
-}
-
 int get_delay_idx(int delay, int max_delay_comp)
 {
   int delay_idx = max_delay_comp + delay;
@@ -1173,6 +934,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

@@ -77,17 +77,8 @@ static inline const char *rnti_types(nr_rnti_type_t rr)
 }
 #undef R
 
-#define MU_SCS(m) (15 << m)
-#define MAX_GSCN_BAND 620 // n78 has the highest GSCN range of 619
-
 #define NR_MAX_NB_LAYERS 4 // 8
 
-// Since the IQ samples are represented by SQ15 R+I (see https://en.wikipedia.org/wiki/Q_(number_format)) we need to compensate when
-// calcualting signal energy. Instead of shifting each sample right by 15, we can normalize the result in dB scale once its
-// calcualted. Signal energy is calculated using RMS^2, where each sample is squared before taking the average of the sum, therefore
-// the total shift is 2 * 15, in dB scale thats 10log10(2^(15*2))
-#define SQ15_SQUARED_NORM_FACTOR_DB 90.3089986992
-
 typedef struct nr_bandentry_s {
   int16_t band;
   uint64_t ul_min;
@@ -107,12 +98,6 @@ typedef struct {
   int last_gscn;
 } sync_raster_t;
 
-typedef struct {
-  int gscn;
-  double ssRef;
-  int ssbFirstSC;
-} nr_gscn_info_t;
-
 typedef enum frequency_range_e {
   FR1 = 0,
   FR2
@@ -241,13 +226,11 @@ 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);
 
-int get_scan_ssb_first_sc(const double fc,
-                          const int nbRB,
-                          const int nrBand,
-                          const int mu,
-                          nr_gscn_info_t ssbStartSC[MAX_GSCN_BAND]);
+void freq2time(uint16_t ofdm_symbol_size,
+               int16_t *freq_signal,
+               int16_t *time_signal);
 
-void check_ssb_raster(uint64_t freq, int band, int scs);
+void nr_est_delay(int ofdm_symbol_size, const c16_t *ls_est, c16_t *ch_estimates_time, delay_t *delay);
 
 #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/nr/tests/test_nr_common.cpp

@@ -1,47 +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
- */
-
-#include <gtest/gtest.h>
-extern "C" {
-#include "nr_common.h"
-#include "common/utils/LOG/log.h"
-}
-
-TEST(nr_common, nr_timer) {
-  NR_timer_t timer;
-  nr_timer_setup(&timer, 10, 1);
-  nr_timer_start(&timer);
-  EXPECT_TRUE(is_nr_timer_active(timer));
-  EXPECT_FALSE(nr_timer_expired(timer));
-  for (auto i = 0; i < 10; i++) {
-    nr_timer_tick(&timer);
-  }
-  EXPECT_FALSE(is_nr_timer_active(timer));
-  EXPECT_TRUE(nr_timer_expired(timer));
-}
-
-
-int main(int argc, char **argv)
-{
-  logInit();
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

common/utils/oai_asn1.h

@@ -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/ocp_itti/intertask_interface.cpp

@@ -343,7 +343,7 @@ typedef struct timer_elm_s {
     tasks[newQueue]= new task_list_t;
     tasks[newQueue]->task_parms = {0};
     pthread_mutex_unlock (&lock_nb_queues);
-    LOG_D(ITTI, "Starting itti queue: %s as task %d\n", taskInfo->name, newQueue);
+    LOG_I(ITTI,"Starting itti queue: %s as task %d\n", taskInfo->name, newQueue);
     pthread_mutex_init(&tasks[newQueue]->queue_cond_lock, NULL);
     memcpy(&tasks[newQueue]->admin, taskInfo, sizeof(task_info_t));
     AssertFatal( ( tasks[newQueue]->epoll_fd = epoll_create1(0) ) >=0, "");

common/utils/system.c

@@ -32,7 +32,6 @@
 #include "system.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <string.h>
@@ -96,6 +95,17 @@ static void read_pipe(int p, char *b, int size) {
     size -= ret;
   }
 }
+int checkIfFedoraDistribution(void) {
+  return !system("grep -iq 'ID_LIKE.*fedora' /etc/os-release ");
+}
+
+int checkIfGenericKernelOnFedora(void) {
+  return system("uname -a | grep -q rt");
+}
+
+int checkIfInsideContainer(void) {
+  return !system("egrep -q 'libpod|podman|kubepods'  /proc/self/cgroup");
+}
 
 /********************************************************************/
 /* background process                                               */
@@ -215,71 +225,43 @@ int rt_sleep_ns (uint64_t x)
   return clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &myTime, NULL);
 }
 
-#ifdef HAVE_LIB_CAP
-#include <sys/capability.h>
-/* \brief reports if the current thread has capability CAP_SYS_NICE, i.e. */
-bool has_cap_sys_nice(void)
-{
-  /* get capabilities of calling PID */
-  cap_t cap = cap_get_pid(0);
-  cap_flag_value_t val;
-  /* check to what CAP_SYS_NICE is currently ("effective capability") set */
-  int ret = cap_get_flag(cap, CAP_SYS_NICE, CAP_EFFECTIVE, &val);
-  AssertFatal(ret == 0, "Error in cap_get_flag(): ret %d errno %d\n", ret, errno);
-  cap_free(cap);
-  /* return true if CAP_SYS_NICE is currently set */
-  return val == CAP_SET;
-}
-#else
-/* libcap has not been detected on this system. We do not need to require it --
- * we can try to read directly via a syscall. This is discouraged, though; from
- * the man page: "The portable interfaces are cap_set_proc(3) and
- * cap_get_proc(3); if possible, you should use those interfaces in
- * applications". */
-#include <sys/syscall.h>      /* Definition of SYS_* constants */
-#include <linux/capability.h> /* capabilities used below */
-/* \brief reports if the current thread has capability CAP_SYS_NICE, i.e. */
-bool has_cap_sys_nice(void)
-{
-  struct __user_cap_header_struct hdr = {.version = _LINUX_CAPABILITY_VERSION_3};
-  struct __user_cap_data_struct cap[2];
-  if (syscall(SYS_capget, &hdr, cap) == -1)
-    return false;
-  return (cap[0].effective & (1 << CAP_SYS_NICE)) != 0;
-}
-#endif
-
-void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name, int affinity, int priority)
-{
-  int ret;
-  bool set_prio = has_cap_sys_nice();
-
+void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name, int affinity, int priority){
   pthread_attr_t attr;
+  int ret;
+  int settingPriority = 1;
   ret=pthread_attr_init(&attr);
   AssertFatal(ret == 0, "Error in pthread_attr_init(): ret: %d, errno: %d\n", ret, errno);
 
-  if (set_prio) {
-    ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
-    AssertFatal(ret == 0, "Error in pthread_attr_setinheritsched(): ret: %d, errno: %d\n", ret, errno);
-    ret = pthread_attr_setschedpolicy(&attr, SCHED_OAI);
-    AssertFatal(ret == 0, "Error in pthread_attr_setschedpolicy(): ret: %d, errno: %d\n", ret, errno);
-    AssertFatal(priority >= sched_get_priority_min(SCHED_OAI) && priority <= sched_get_priority_max(SCHED_OAI),
-                "Scheduling priority %d not possible: must be within [%d, %d]\n",
-                priority,
-                sched_get_priority_min(SCHED_OAI),
-                sched_get_priority_max(SCHED_OAI));
-    AssertFatal(priority <= sched_get_priority_max(SCHED_OAI), "");
-    struct sched_param sparam = {0};
-    sparam.sched_priority = priority;
-    ret = pthread_attr_setschedparam(&attr, &sparam);
-    AssertFatal(ret == 0, "Error in pthread_attr_setschedparam(): ret: %d errno: %d\n", ret, errno);
-    LOG_I(UTIL, "%s() for %s: creating thread with affinity %x, priority %d\n", __func__, name, affinity, priority);
-  } else {
-    affinity = -1;
-    priority = -1;
-    LOG_I(UTIL, "%s() for %s: creating thread (no affinity, default priority)\n", __func__, name);
-  }
+  LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d\n",name,affinity,priority);
 
+  if (checkIfFedoraDistribution())
+    if (checkIfGenericKernelOnFedora())
+      if (checkIfInsideContainer())
+        settingPriority = 0;
+  
+  if (settingPriority) {
+    ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+    AssertFatal(ret == 0, "Error in pthread_attr_setinheritsched(): ret: %d, errno: %d\n", ret, errno);
+    ret=pthread_attr_setschedpolicy(&attr, SCHED_OAI);
+    AssertFatal(ret == 0, "Error in pthread_attr_setschedpolicy(): ret: %d, errno: %d\n", ret, errno);
+    if(priority<sched_get_priority_min(SCHED_OAI) || priority>sched_get_priority_max(SCHED_OAI)) {
+      LOG_E(UTIL,"Prio not possible: %d, min is %d, max: %d, forced in the range\n",
+	    priority,
+	    sched_get_priority_min(SCHED_OAI),
+	    sched_get_priority_max(SCHED_OAI));
+      if(priority<sched_get_priority_min(SCHED_OAI))
+        priority=sched_get_priority_min(SCHED_OAI);
+      if(priority>sched_get_priority_max(SCHED_OAI))
+        priority=sched_get_priority_max(SCHED_OAI);
+    }
+    AssertFatal(priority<=sched_get_priority_max(SCHED_OAI),"");
+    struct sched_param sparam={0};
+    sparam.sched_priority = priority;
+    ret=pthread_attr_setschedparam(&attr, &sparam);
+    AssertFatal(ret == 0, "Error in pthread_attr_setschedparam(): ret: %d errno: %d\n", ret, errno);
+  }
+ 
+  LOG_I(UTIL,"threadCreate for %s, affinity %x, priority %d\n",name,affinity,priority); 
   ret=pthread_create(t, &attr, func, param);
   AssertFatal(ret == 0, "Error in pthread_create(): ret: %d, errno: %d\n", ret, errno);
   
@@ -332,6 +314,11 @@ void thread_top_init(char *thread_name,
     }
   }
 
+  if (checkIfFedoraDistribution())
+    if (checkIfGenericKernelOnFedora())
+      if (checkIfInsideContainer())
+        settingPriority = 0;
+
   if (settingPriority) {
     memset(&sparam, 0, sizeof(sparam));
     sparam.sched_priority = sched_get_priority_max(SCHED_FIFO);
@@ -360,10 +347,37 @@ void thread_top_init(char *thread_name,
   }
 }
 
-/* \brief lock memory to RAM to avoid delays */
-void lock_memory_to_ram(void)
-{
-  int rc = mlockall(MCL_CURRENT | MCL_FUTURE);
-  if (rc != 0)
-    LOG_W(UTIL, "mlockall() failed: %d, %s\n", errno, strerror(errno));
+
+// Block CPU C-states deep sleep
+void set_latency_target(void) {
+  int ret;
+  static int latency_target_fd=-1;
+  uint32_t latency_target_value=2; // in microseconds
+  if (latency_target_fd == -1) {
+    if ( (latency_target_fd = open("/dev/cpu_dma_latency", O_RDWR)) != -1 ) {
+      ret = write(latency_target_fd, &latency_target_value, sizeof(latency_target_value));
+      if (ret == 0) {
+	printf("# error setting cpu_dma_latency to %u!: %s\n", latency_target_value, strerror(errno));
+	close(latency_target_fd);
+	latency_target_fd=-1;
+	return;
+      }
+    }
+  }
+  if (latency_target_fd != -1) 
+    LOG_I(HW,"# /dev/cpu_dma_latency set to %u us\n", latency_target_value);
+  else
+    LOG_E(HW,"Can't set /dev/cpu_dma_latency to %u us\n", latency_target_value);
+
+  // Set CPU frequency to it's maximum
+  int system_ret = system("for d in /sys/devices/system/cpu/cpu[0-9]*; do cat $d/cpufreq/cpuinfo_max_freq > $d/cpufreq/scaling_min_freq; done");
+  if (system_ret == -1) {
+    LOG_E(HW, "Can't set cpu frequency: [%d]  %s\n", errno, strerror(errno));
+    return;
+  }
+  if (!((WIFEXITED(system_ret)) && (WEXITSTATUS(system_ret) == 0))) {
+    LOG_E(HW, "Can't set cpu frequency\n");
+  }
+  mlockall(MCL_CURRENT | MCL_FUTURE);
+
 }

common/utils/system.h

@@ -23,7 +23,6 @@
 #define _SYSTEM_H_OAI_
 #include <stdint.h>
 #include <pthread.h>
-#include <stdbool.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -43,9 +42,8 @@ int background_system(char *command);
 
 void start_background_system(void);
 
-void lock_memory_to_ram(void);
+void set_latency_target(void);
 
-bool has_cap_sys_nice(void);
 void threadCreate(pthread_t *t, void *(*func)(void *), void *param, char *name, int affinity, int priority);
 
 #define SCHED_OAI SCHED_RR
@@ -63,6 +61,9 @@ void thread_top_init(char *thread_name,
  * Functions to check system at runtime.
  ****************************************************/
 
+int checkIfFedoraDistribution(void);
+int checkIfGenericKernelOnFedora(void);
+int checkIfInsideContainer(void);
 int rt_sleep_ns (uint64_t x);
 #ifdef __cplusplus
 }

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/threadPool/CMakeLists.txt

@@ -1,6 +0,0 @@
-if (ENABLE_TESTS)
-  add_subdirectory(test)
-endif()
-add_library(thread-pool thread-pool.c)
-target_link_libraries(thread-pool PRIVATE utils)
-target_include_directories(thread-pool PUBLIC .)

common/utils/threadPool/Makefile

@@ -0,0 +1,3 @@
+thread-pool-test: thread-pool.c thread-pool.h
+	gcc -g -O3 thread-pool.c -I ${OPENAIR_DIR}/nfapi/open-nFAPI/nfapi/public_inc -I ${OPENAIR_DIR}/ -I ${OPENAIR_DIR}/common/utils/  -I. -I ${OPENAIR_DIR}/openair2/COMMON ${OPENAIR_DIR}/common/utils/system.c ${OPENAIR_DIR}/common/utils/LOG/log.c ${OPENAIR_DIR}/common/config/config_userapi.c ${OPENAIR_DIR}/common/config/config_load_configmodule.c ${OPENAIR_DIR}/common/config/config_cmdline.c -lpthread -ldl -D TEST_THREAD_POOL -DMAX_NUM_CCs=1 -I../LOG -I../../utils/T -o thread-pool-test
+

common/utils/threadPool/test/CMakeLists.txt

@@ -1,6 +0,0 @@
-add_executable(test_thread-pool
-  test_thread-pool.c)
-add_dependencies(tests test_thread-pool)
-target_link_libraries(test_thread-pool PRIVATE thread-pool pthread LOG minimal_lib)
-add_test(NAME test_thread-pool
-  COMMAND ./test_thread-pool)

common/utils/threadPool/test/test_thread-pool.c

@@ -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
- */
-
-#include <sched.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/sysinfo.h>
-#include <threadPool/thread-pool.h>
-#include "log.h"
-
-void displayList(notifiedFIFO_t *nf)
-{
-  int n = 0;
-  notifiedFIFO_elt_t *ptr = nf->outF;
-
-  while (ptr) {
-    printf("element: %d, key: %lu\n", ++n, ptr->key);
-    ptr = ptr->next;
-  }
-
-  printf("End of list: %d elements\n", n);
-}
-
-struct testData {
-  int id;
-  int sleepTime;
-  char txt[50];
-};
-
-void processing(void *arg)
-{
-  struct testData *in = (struct testData *)arg;
-  // printf("doing: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
-  sprintf(in->txt, "Done by %ld, job %d", pthread_self(), in->id);
-  in->sleepTime = rand() % 1000;
-  usleep(in->sleepTime);
-  // printf("done: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
-}
-
-int main()
-{
-  logInit();
-  notifiedFIFO_t myFifo;
-  initNotifiedFIFO(&myFifo);
-  int num_elements_on_queue = 0;
-  pushNotifiedFIFO(&myFifo, newNotifiedFIFO_elt(sizeof(struct testData), 1234, NULL, NULL));
-  num_elements_on_queue++;
-
-  for (int i = 10; i > 1; i--) {
-    pushNotifiedFIFO(&myFifo, newNotifiedFIFO_elt(sizeof(struct testData), 1000 + i, NULL, NULL));
-    num_elements_on_queue++;
-  }
-
-  displayList(&myFifo);
-  notifiedFIFO_elt_t *tmp = pullNotifiedFIFO(&myFifo);
-  printf("pulled: %lu\n", tmp->key);
-  displayList(&myFifo);
-  delNotifiedFIFO_elt(tmp);
-  tmp = pullNotifiedFIFO(&myFifo);
-  num_elements_on_queue--;
-  printf("pulled: %lu\n", tmp->key);
-  displayList(&myFifo);
-  pushNotifiedFIFO(&myFifo, newNotifiedFIFO_elt(sizeof(struct testData), 12345678, NULL, NULL));
-  displayList(&myFifo);
-  delNotifiedFIFO_elt(tmp);
-
-  do {
-    tmp = pollNotifiedFIFO(&myFifo);
-
-    if (tmp) {
-      printf("pulled: %lu\n", tmp->key);
-      displayList(&myFifo);
-      delNotifiedFIFO_elt(tmp);
-      num_elements_on_queue--;
-    } else
-      printf("Empty list \n");
-  } while (num_elements_on_queue > 0);
-  AssertFatal(pollNotifiedFIFO(&myFifo) == NULL, "Unexpected extra element on queue\n");
-
-  tpool_t pool;
-  char params[] = "1,2,3,4,5";
-  initTpool(params, &pool, true);
-  notifiedFIFO_t worker_back;
-  initNotifiedFIFO(&worker_back);
-
-  //sleep(1);
-  int cumulProcessTime = 0;
-  struct timespec st, end;
-  clock_gettime(CLOCK_MONOTONIC, &st);
-  int nb_jobs = 4;
-  for (int i = 0; i < 1000; i++) {
-    int parall = nb_jobs;
-    for (int j = 0; j < parall; j++) {
-      notifiedFIFO_elt_t *work = newNotifiedFIFO_elt(sizeof(struct testData), i, &worker_back, processing);
-      struct testData *x = (struct testData *)NotifiedFifoData(work);
-      x->id = i;
-      pushTpool(&pool, work);
-    }
-    int sleepmax = 0;
-    while (parall) {
-      tmp = pullTpool(&worker_back, &pool);
-      if (tmp) {
-        parall--;
-        struct testData *dd = NotifiedFifoData(tmp);
-        if (dd->sleepTime > sleepmax)
-          sleepmax = dd->sleepTime;
-        delNotifiedFIFO_elt(tmp);
-      }
-    }
-    cumulProcessTime += sleepmax;
-  }
-  clock_gettime(CLOCK_MONOTONIC, &end);
-  long long dur = (end.tv_sec - st.tv_sec) * 1000 * 1000 + (end.tv_nsec - st.tv_nsec) / 1000;
-  printf("In µs, Total time per group of %d job:%lld, work time per job %d, overhead per job %lld\n",
-         nb_jobs,
-         dur / 1000,
-         cumulProcessTime / 1000,
-         (dur - cumulProcessTime) / (1000 * nb_jobs));
-  abortTpool(&pool);
-  return 0;
-}

common/utils/threadPool/thread-pool.c

@@ -33,6 +33,17 @@
 #include <sys/sysinfo.h>
 #include <threadPool/thread-pool.h>
 
+void displayList(notifiedFIFO_t *nf) {
+  int n=0;
+  notifiedFIFO_elt_t *ptr=nf->outF;
+
+  while(ptr) {
+    printf("element: %d, key: %lu\n",++n,ptr->key);
+    ptr=ptr->next;
+  }
+
+  printf("End of list: %d elements\n",n);
+}
 
 static inline  notifiedFIFO_elt_t *pullNotifiedFifoRemember( notifiedFIFO_t *nf, struct one_thread *thr) {
   mutexlock(nf->lockF);
@@ -130,6 +141,7 @@ void initNamedTpool(char *params,tpool_t *pool, bool performanceMeas, char *name
         ptr=pool->allthreads;
         pool->allthreads=(struct one_thread *)malloc(sizeof(struct one_thread));
         pool->allthreads->next=ptr;
+        printf("create a thread for core %d\n", atoi(curptr));
         pool->allthreads->coreID=atoi(curptr);
         pool->allthreads->id=pool->nbThreads;
         pool->allthreads->pool=pool;
@@ -165,3 +177,121 @@ void initFloatingCoresTpool(int nbThreads,tpool_t *pool, bool performanceMeas, c
   threads[sizeof(threads)-1]=0;
   initNamedTpool(threads, pool, performanceMeas, name);
 }
+
+#ifdef TEST_THREAD_POOL
+int oai_exit = 0;
+
+void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
+{
+  if (assert) {
+    abort();
+  } else {
+    exit(EXIT_SUCCESS);
+  }
+}
+
+struct testData {
+  int id;
+  int sleepTime;
+  char txt[30];
+};
+
+void processing(void *arg) {
+  struct testData *in=(struct testData *)arg;
+  //printf("doing: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+  sprintf(in->txt,"Done by %ld, job %d", pthread_self(), in->id);
+  in->sleepTime=rand()%1000;
+  usleep(in->sleepTime);
+  //printf("done: %d, %s, in thr %ld\n",in->id, in->txt,pthread_self() );
+}
+
+int main() {
+  notifiedFIFO_t myFifo;
+  initNotifiedFIFO(&myFifo);
+  pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1234,NULL,NULL));
+
+  for(int i=10; i>1; i--) {
+    pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 1000+i,NULL,NULL));
+  }
+
+  displayList(&myFifo);
+  notifiedFIFO_elt_t *tmp=pullNotifiedFIFO(&myFifo);
+  printf("pulled: %lu\n", tmp->key);
+  displayList(&myFifo);
+  tmp=pullNotifiedFIFO(&myFifo);
+  printf("pulled: %lu\n", tmp->key);
+  displayList(&myFifo);
+  pushNotifiedFIFO(&myFifo,newNotifiedFIFO_elt(sizeof(struct testData), 12345678, NULL, NULL));
+  displayList(&myFifo);
+
+  do {
+    tmp=pollNotifiedFIFO(&myFifo);
+
+    if (tmp) {
+      printf("pulled: %lu\n", tmp->key);
+      displayList(&myFifo);
+    } else
+      printf("Empty list \n");
+  } while(tmp);
+
+  tpool_t  pool;
+  char params[]="1,2,3,4,5";
+  initTpool(params,&pool, true);
+  notifiedFIFO_t worker_back;
+  initNotifiedFIFO(&worker_back);
+
+  sleep(1);
+  int cumulProcessTime=0, cumulTime=0;
+  struct timespec st,end;
+  clock_gettime(CLOCK_MONOTONIC, &st);
+  int nb_jobs=4;
+  for (int i=0; i <1000 ; i++) {
+    int parall=nb_jobs;
+    for (int j=0; j <parall ; j++) {
+      notifiedFIFO_elt_t *work=newNotifiedFIFO_elt(sizeof(struct testData), i, &worker_back, processing);
+      struct testData *x=(struct testData *)NotifiedFifoData(work);
+      x->id=i;
+      pushTpool(&pool, work);
+    }
+    int sleepmax=0;
+    while (parall) {
+      tmp=pullTpool(&worker_back,&pool);
+      if (tmp) {
+	parall--;
+	struct testData *dd=NotifiedFifoData(tmp);
+	if (dd->sleepTime > sleepmax)
+	  sleepmax=dd->sleepTime;
+	delNotifiedFIFO_elt(tmp);
+      }
+    }
+    cumulProcessTime+=sleepmax;
+  }
+  clock_gettime(CLOCK_MONOTONIC, &end);
+  long long dur=(end.tv_sec-st.tv_sec)*1000*1000+(end.tv_nsec-st.tv_nsec)/1000;
+  printf("In µs, Total time per group of %d job:%lld, work time per job %d, overhead per job %lld\n",
+	 nb_jobs, dur/1000, cumulProcessTime/1000, (dur-cumulProcessTime)/(1000*nb_jobs));
+
+	/*	
+  for (int i=0; i <1000 ; i++) {
+    notifiedFIFO_elt_t *work=newNotifiedFIFO_elt(sizeof(struct testData), i, &worker_back, processing);
+    struct testData *x=(struct testData *)NotifiedFifoData(work);
+    x->id=i;
+    pushTpool(&pool, work);
+  }
+
+  do {
+    tmp=pullTpool(&worker_back,&pool);
+
+    if (tmp) {
+      struct testData *dd=NotifiedFifoData(tmp);
+      printf("Result: %s\n",dd->txt);
+      delNotifiedFIFO_elt(tmp);
+    } else
+      printf("Empty list \n");
+
+    abortTpoolJob(&pool,510);
+  } while(tmp);
+	*/
+  return 0;
+}
+#endif

common/utils/threadPool/thread-pool.h

@@ -336,9 +336,7 @@ static inline int abortTpool(tpool_t *t) {
   thread = t->allthreads;
   while (thread != NULL) {
     pthread_cancel(thread->threadID);
-    struct one_thread *next = thread->next;
-    free(thread);
-    thread = next;
+    thread = thread->next;
   }
 
   return nbRemoved;