Add throughput plotting

CMakeLists.txt

@@ -498,36 +498,19 @@ if (ENABLE_LDPC_T2)
   add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
   set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
   target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
-  set(PHY_LDPC_SLOT_T2_SRC
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_coding_t2.c
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-  )
-add_library(ldpc_slot_t2 MODULE ${PHY_LDPC_SLOT_T2_SRC})
-  set_target_properties(ldpc_slot_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_link_libraries(ldpc_slot_t2 PRIVATE ldpc_gen_HEADERS ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
 endif()
 
 ##########################################################
 
-# LDPC offload library - XDMA
-##########################################################
-add_boolean_option(ENABLE_LDPC_XDMA OFF "Build support for LDPC Offload to XDMA library" OFF)
-if (ENABLE_LDPC_XDMA)
-  set(PHY_NRLDPC_CODING_XDMA_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload_xdma.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_xdma.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_encoder.c
-  )
-  add_library(ldpc_xdma MODULE ${PHY_NRLDPC_CODING_XDMA_SRC})
-endif()
-
 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)
@@ -868,19 +851,10 @@ add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
 target_link_libraries(ldpc_cl OpenCL)
 add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
 
-set(PHY_NRLDPC_CODING_DEMO_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_encoder.c
-)
-
 set(PHY_NR_CODINGIF
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
 )
 
-set(PHY_NRLDPC_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_load.c
-)
-
 ##############################################
 # Base CUDA setting
 ##############################################
@@ -901,7 +875,6 @@ add_library(coding MODULE ${PHY_TURBOSRC} )
 
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
 
-add_library(ldpc_slot_demo MODULE ${PHY_NRLDPC_CODING_DEMO_SRC})
 
 set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
@@ -1044,7 +1017,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_csi_rs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/scrambling_luts.c
-  ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
   )
 
@@ -1061,9 +1033,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
@@ -1072,6 +1042,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
@@ -1093,7 +1064,6 @@ set(PHY_SRC_UE
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_NR_CODINGIF}
-  ${PHY_NRLDPC_CODINGIF}
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -1113,9 +1083,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding_slot.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
@@ -1154,7 +1122,6 @@ set(PHY_SRC_UE
   ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_NR_CODINGIF}
-  ${PHY_NRLDPC_CODINGIF}
   )
 
 
@@ -1188,10 +1155,6 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 add_library(PHY_NR ${PHY_NR_SRC})
 target_link_libraries(PHY_NR nr_phy_common nr_common)
 
-add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
-target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
-target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
-
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
 target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
 
@@ -1520,6 +1483,10 @@ 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} )
@@ -1918,6 +1885,13 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
 
+add_library(SIMU_ETH STATIC
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
+)
+target_link_libraries(SIMU_ETH PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1966,6 +1940,8 @@ add_executable(lte-softmodem
   ${OPENAIR_DIR}/executables/create_tasks_mbms.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -1978,7 +1954,7 @@ target_link_libraries(lte-softmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU shlib_loader
+  ${NAS_UE_LIB} ITTI SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
 
 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
@@ -2022,17 +1998,22 @@ add_executable(lte-uesoftmodem
   ${OPENAIR_DIR}/executables/create_tasks_ue.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
+if (NOT ${NOS1})
+	target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+endif()
 target_link_libraries(lte-uesoftmodem PRIVATE
   -Wl,--start-group
   lte_rrc nr_rrc s1ap x2ap m2ap m3ap
   SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${NAS_UE_LIB} ITTI shlib_loader
   -Wl,--end-group z dl)
 
@@ -2057,6 +2038,8 @@ add_executable(nr-softmodem
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2067,7 +2050,7 @@ target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
   ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_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)
 
@@ -2085,14 +2068,10 @@ if(E2_AGENT)
 endif()
 
 
-add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_demo)
+add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
 
 if (ENABLE_LDPC_T2)
-  add_dependencies(nr-softmodem ldpc_t2 ldpc_slot_t2)
-endif()
-
-if (ENABLE_LDPC_XDMA)
-  add_dependencies(nr-softmodem ldpc_xdma)
+  add_dependencies(nr-softmodem ldpc_t2)
 endif()
 
 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2102,6 +2081,7 @@ target_link_libraries(nr-softmodem PRIVATE
 add_executable(nr-cuup
   executables/nr-cuup.c
   executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
   ${NR_PDCP_SRC}
@@ -2110,7 +2090,7 @@ add_executable(nr-cuup
 
 target_link_libraries(nr-cuup PRIVATE
                       CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap f1ap
+                      GTPV1U e1ap f1ap SIMU_ETH
                       z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 if(E2_AGENT)
@@ -2129,7 +2109,9 @@ add_executable(nr-uesoftmodem
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
@@ -2139,14 +2121,14 @@ target_link_libraries(nr-uesoftmodem PRIVATE
   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
   NFAPI_USER_LIB MISC_NFAPI_NR_LIB
-  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU shlib_loader
+  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH shlib_loader
   -Wl,--end-group z dl)
 
-target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
+target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
-add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_demo)
+add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
 if (ENABLE_LDPC_CUDA)
    add_dependencies(nr-uesoftmodem ldpc_cuda)
    add_dependencies(nr-softmodem ldpc_cuda)
@@ -2239,13 +2221,14 @@ add_executable(nr_psbchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
   m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2265,14 +2248,15 @@ add_executable(nr_dlsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2300,6 +2284,7 @@ add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
@@ -2307,16 +2292,12 @@ add_executable(nr_ulsim
   )
 
 if (ENABLE_LDPC_T2)
-  add_dependencies(nr_ulsim ldpc_t2 ldpc_slot_t2)
+  add_dependencies(nr_ulsim ldpc_t2)
 endif()
-if (ENABLE_LDPC_XDMA)
-  add_dependencies(nr_ulsim ldpc_xdma)
-endif()
-add_dependencies(nr_ulsim ldpc_slot_demo)
 
 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
   )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
@@ -2363,7 +2344,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
@@ -2378,14 +2359,94 @@ if (${T_TRACER})
         MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
         L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
-        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc ldpc_slot_demo ldpc_slot_t2 ldpc_xdma dfts config_internals nr_common)
+        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals nr_common)
     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")

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.

ci-scripts/Jenkinsfile-GitLab-Container

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

ci-scripts/ci_infra.yaml

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

ci-scripts/cls_cluster.py

@@ -43,6 +43,7 @@ NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
+CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
 CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
 CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]
 
@@ -67,9 +68,10 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')
 
-def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_deploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
@@ -82,9 +84,10 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
 	OC_logout(cmd)
 	return True, report
 
-def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_undeploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run(f'rm -Rf {path}/logs')

ci-scripts/cls_module.py

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

ci-scripts/cls_oaicitest.py

@@ -96,44 +96,45 @@ def Iperf_ComputeTime(args):
 	return int(result.group('iperf_time'))
 
 def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
-	try:
-		with open(filename) as f:
-			 results = json.load(f)
-		sender_bitrate   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file {filename}: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute Iperf3 bitrate!')
+
 	snd_msg = f'Sender Bitrate   : {sender_bitrate} Mbps'
 	rcv_msg = f'Receiver Bitrate : {receiver_bitrate} Mbps'
 	success = True
-	if iperf_tcp_rate_target is not None:
-		success = float(receiver_bitrate) >= float(iperf_tcp_rate_target)
-		if success:
-			rcv_msg += f" (target: {iperf_tcp_rate_target})"
+	if (iperf_tcp_rate_target is not None):
+		if (int(receiver_bitrate) < int(iperf_tcp_rate_target)):
+			rcv_msg += f" (too low! < {iperf_tcp_rate_target} Mbps)"
+			success = False
 		else:
-			rcv_msg += f" (too low! < {iperf_tcp_rate_target})"
+			rcv_msg += f" (target : {iperf_tcp_rate_target} Mbps)"
 	return(success, f'{snd_msg}\n{rcv_msg}')
 
 def Iperf_analyzeV3BIDIRJson(filename):
-	try:
-		with open(filename) as f:
-			results = json.load(f)
-		sender_bitrate_ul   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_ul = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-		sender_bitrate_dl   = round(results['end']['streams'][1]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_dl = round(results['end']['streams'][1]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 Bidir TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 Bidir TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate_ul   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_ul = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+			sender_bitrate_dl   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_dl = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute BIDIR bitrate!')
 
 	msg = f'Sender Bitrate DL   : {sender_bitrate_dl} Mbps\n'
 	msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -85,7 +85,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        ra_ResponseWindow                                           = 4;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
@@ -217,6 +217,14 @@ rfsimulator: {
     serveraddr = "server";
 };
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 
 security = {
   # preferred ciphering algorithms

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,297 +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 = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    //nr_cellid = 12345678L;
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 1;
-    maxMIMO_layers        = 2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 0 ;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
-      absoluteFrequencySSB                                          = 666624;
-      dl_frequencyBand                                              = 77;
-      # this is 3401.58 MHz
-      dl_absoluteFrequencyPointA                                    = 663348;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = 0;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 180;
-  pucch_TargetSNRx10          = 230;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
-  pusch_FailureThres          = 100;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 5;
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
-  clock_src = "internal";
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-}
-);
-
-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";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_addr = ("76:76:64:6e:00:01", "76:76:64:6e:00:01");
-  ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
-  mtu = 9216; # check if xran uses this properly
-  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (285, 429); # (min, max)
-    T2a_cp_ul = (285, 429); # (min, max)
-    T2a_up = (125, 428); # (min, max)
-    Ta3 = (130, 170); # (min, max)
-    T1a_cp_dl = (285, 470); # (min, max)
-    T1a_cp_ul = (285, 429); # (min, max)
-    T1a_up = (125, 350); # (min, max)
-    Ta4 = (110, 180); # (min, max)
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
-  });
-};

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,296 +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 = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 1;
-    maxMIMO_layers        = 2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 0 ;
-    sib1_tda			  = 15;
-#    force_UL256qam_off    = 1;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-     # n_TimingAdvanceOffset                                         = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # this is 3401.58 MHz
-      dl_absoluteFrequencyPointA                                    = 620052;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 151;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 3;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# 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                                                 = -15;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 100;
-  pucch_TargetSNRx10          = 200;
-  dl_bler_target_upper=.35;
-  dl_bler_target_lower=.15;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
-  pusch_FailureThres          = 1000;
-  ul_max_mcs                  = 28;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 90;
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_addr = ("00:11:22:33:44:66", "00:11:22:33:44:67");
-  ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
-  file_prefix = "fhi_72";
-  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (259, 500);
-    T2a_cp_ul = (25, 500);
-    T2a_up = (134, 375);
-    Ta3 = (152, 160);
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
-  });
-};

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ci-scripts/datalog_rt_stats.60.2x2.yaml

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

ci-scripts/docker/Dockerfile.cppcheck.xenial

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

ci-scripts/docker/Dockerfile.formatting.bionic

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

ci-scripts/docker/Dockerfile.unittest.ubuntu22

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:develop AS ran-tests
+FROM ran-base:develop as ran-tests
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \

ci-scripts/epc.py

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

ci-scripts/main.py

@@ -337,13 +337,11 @@ def GetParametersFromXML(action):
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')
 
 	elif action == 'Terminate_5GCN':
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgUnDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')
 
 	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
 		eNB_instance=test.findtext('eNB_instance')

ci-scripts/stats_monitor.py

@@ -4,6 +4,7 @@ To create graphs and pickle from runtime statistics in L1,MAC,RRC,PDCP files
 
 import subprocess
 import time
+from datetime import datetime,timezone,timedelta
 import shlex
 import re
 import sys
@@ -12,6 +13,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import yaml
 import os
+import copy
 
 
 class StatMonitor():
@@ -20,28 +22,85 @@ class StatMonitor():
             self.d = yaml.load(file)
         for node in self.d:#so far we have enb or gnb as nodes
             for metric_l1 in self.d[node]: #first level of metric keys
-                if metric_l1!="graph": #graph is a reserved word to configure graph paging, so it is disregarded
+                if metric_l1=="ue": #graph is a reserved word to configure graph paging, so it is disregarded
                     if self.d[node][metric_l1] is None:#first level is None -> create array
                         self.d[node][metric_l1]=[]
                     else: #first level is not None -> there is a second level -> create array
                         for metric_l2 in self.d[node][metric_l1]:
                             self.d[node][metric_l1][metric_l2]=[]                
-
-
+            self.d[node]['rntis']={}
 
     def process_gnb (self,node_type,output):
+        rnti='65535'
+        bp_enable = False
+        ts = time.gmtime(0) #Bad, but just creating a date
         for line in output:
             tmp=line.decode("utf-8")
-            result=re.match(r'^.*\bdlsch_rounds\b ([0-9]+)\/([0-9]+).*\bdlsch_errors\b ([0-9]+)',tmp)
+            result=re.match(r'^.*\bUE RNTI ([a-zA-Z0-9]+) CU-UE-ID',tmp)
             if result is not None:
-                self.d[node_type]['dlsch_err'].append(int(result.group(3)))
-                percentage=float(result.group(2))/float(result.group(1))
-                self.d[node_type]['dlsch_err_perc_round_1'].append(percentage)
-            result=re.match(r'^.*\bulsch_rounds\b ([0-9]+)\/([0-9]+).*\bulsch_errors\b ([0-9]+)',tmp)
+                rnti=result.group(1)
+                if not rnti in self.d['gnb']['rntis']:
+                   print("Found new RNTI: "+tmp)
+                   self.d['gnb']['rntis'][rnti] = copy.deepcopy(self.d['gnb']['ue'])
+                #bp_enable = True
+                continue
+
+            if bp_enable:
+                print(tmp)
+                breakpoint()
+            result=re.match(r'^.*\bdlsch_rounds\b ([0-9]+)\/([0-9]+).*\bdlsch_errors\b ([0-9]+).*\bBLER\b ([0-9]+[.][0-9]+) \bMCS\b \([0-1]\) ([0-9]+)',tmp)
             if result is not None:
-                self.d[node_type]['ulsch_err'].append(int(result.group(3)))
-                percentage=float(result.group(2))/float(result.group(1))
-                self.d[node_type]['ulsch_err_perc_round_1'].append(percentage)
+                self.d[node_type]['rntis'][rnti]['dlsch_err'].append(int(result.group(3)))
+                try:
+                   percentage=100.0*float(result.group(2))/float(result.group(1))
+                except ZeroDivisionError:
+                   percentage=0.0
+                self.d[node_type]['rntis'][rnti]['dlsch_err_perc_round_1'].append(percentage)
+                self.d[node_type]['rntis'][rnti]['dlbler'].append(float(result.group(4)))
+                self.d[node_type]['rntis'][rnti]['dlmcs'].append(int(result.group(5)))
+                result=re.match(r'^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{6}Z)',tmp)
+                if result is not None:
+                    ts = datetime.strptime(result.group(1),'%Y-%m-%d %H:%M:%S.%fZ')
+                    if sys.version_info[0] == 3 and sys.version_info[1] < 11:
+                       ts = ts.replace(tzinfo=timezone.utc)
+                self.d[node_type]['rntis'][rnti]['timestamp'].append(ts)
+                continue
+
+            result=re.match(rf'^.*\b{rnti}\b: \bMAC\b.*\bTX\b +([0-9]+).*\bRX\b +([0-9]+)',tmp)
+            if result is not None:
+                if len(self.d[node_type]['rntis'][rnti]['dlsch_mbps']) == 0:
+                   self.d[node_type]['rntis'][rnti]['dlsch_mbps'].append(0)
+                   self.d[node_type]['rntis'][rnti]['ulsch_mbps'].append(0)
+                   self.d[node_type]['rntis'][rnti]['dlsch_prev_bytes'].append(float(result.group(1)))
+                   self.d[node_type]['rntis'][rnti]['ulsch_prev_bytes'].append(float(result.group(2)))
+                else :
+                   prev = self.d[node_type]['rntis'][rnti]['dlsch_prev_bytes'].pop()
+                   #8 bits per byte, 10^20 Bits per Mbps, subtract bler
+                   times =self.d[node_type]['rntis'][rnti]['timestamp'][-2:]
+                   #delta_t = times[1]-times[0]
+                   delta_t = timedelta(milliseconds=1280)
+                   delta = (float(result.group(1)) - prev)*2**3/2**20*(1.0- self.d[node_type]['rntis'][rnti]['dlbler'][-1])/delta_t.total_seconds()
+                   self.d[node_type]['rntis'][rnti]['dlsch_mbps'].append(delta)
+                   self.d[node_type]['rntis'][rnti]['dlsch_prev_bytes'].append(float(result.group(1)))
+
+                   prev = self.d[node_type]['rntis'][rnti]['ulsch_prev_bytes'].pop()
+                   #8 bites per byte, 10^20 bits per mbps, subtract bler
+                   delta = (float(result.group(2)) - prev)*2**3/2**20*(1.0-self.d[node_type]['rntis'][rnti]['ulbler'][-1])/delta_t.total_seconds()
+                   self.d[node_type]['rntis'][rnti]['ulsch_mbps'].append(delta)
+                   self.d[node_type]['rntis'][rnti]['ulsch_prev_bytes'].append(float(result.group(2)))
+                continue
+
+            result=re.match(r'^.*\bulsch_rounds\b ([0-9]+)\/([0-9]+).*\bulsch_errors\b ([0-9]+).*\bBLER\b ([0-9]+[.][0-9]+) \bMCS\b \([0-1]\) ([0-9]+)',tmp)
+            if result is not None:
+                self.d[node_type]['rntis'][rnti]['ulsch_err'].append(int(result.group(3)))
+                try:
+                   percentage=100.0*float(result.group(2))/float(result.group(1))
+                except ZeroDivisionError:
+                   percentage=0.0
+                self.d[node_type]['rntis'][rnti]['ulsch_err_perc_round_1'].append(percentage)
+                self.d[node_type]['rntis'][rnti]['ulbler'].append(float(result.group(4)))
+                self.d[node_type]['rntis'][rnti]['ulmcs'].append(int(result.group(5)))
+                continue
 
             for k in self.d[node_type]['rt']:
                 result=re.match(rf'^.*\b{k}\b:\s+([0-9\.]+) us;\s+([0-9]+);\s+([0-9\.]+) us;',tmp)
@@ -61,18 +120,14 @@ class StatMonitor():
 
 
     def collect(self,testcase_id,node_type):
-        if node_type=='enb':
-            files = ["L1_stats.log", "MAC_stats.log", "PDCP_stats.log", "RRC_stats.log"]
-        else: #'gnb'
-            files = ["nrL1_stats.log", "nrMAC_stats.log", "nrPDCP_stats.log", "nrRRC_stats.log"]
         #append each file's contents to another file (prepended with CI-) for debug
-        for f in files:
+        for f in self.d[node_type]['files']:
             if os.path.isfile(f):
                 cmd = 'cat '+ f + ' >> CI-'+testcase_id+'-'+f
                 subprocess.Popen(cmd,shell=True)  
         #join the files for further processing
         cmd='cat '
-        for f in files:
+        for f in self.d[node_type]['files']:
             if os.path.isfile(f):
                 cmd += f+' '
         process=subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE)
@@ -86,34 +141,54 @@ class StatMonitor():
     def graph(self,testcase_id, node_type):
         for page in self.d[node_type]['graph']:#work out a set a graphs per page
             col = 1
-            figure, axis = plt.subplots(len(self.d[node_type]['graph'][page]), col ,figsize=(10, 10))
+            figure, axis = plt.subplots(len(self.d[node_type]['graph'][page]), col ,figsize=(10, 10), sharex=True)
             i=0
             for m in self.d[node_type]['graph'][page]:#metric may refer to 1 level or 2 levels 
                 metric_path=m.split('.')
-                if len(metric_path)==1:#1 level
-                    metric_l1=metric_path[0]
-                    major_ticks = np.arange(0, len(self.d[node_type][metric_l1])+1, 1)
-                    axis[i].set_xticks(major_ticks)
-                    axis[i].set_xticklabels([])
-                    axis[i].plot(self.d[node_type][metric_l1],marker='o')
-                    axis[i].set_xlabel('time')
-                    axis[i].set_ylabel(metric_l1)
-                    axis[i].set_title(metric_l1)
-                    
-                else:#2 levels
-                    metric_l1=metric_path[0]
-                    metric_l2=metric_path[1]
-                    major_ticks = np.arange(0, len(self.d[node_type][metric_l1][metric_l2])+1, 1)
-                    axis[i].set_xticks(major_ticks)
-                    axis[i].set_xticklabels([])
-                    axis[i].plot(self.d[node_type][metric_l1][metric_l2],marker='o')
-                    axis[i].set_xlabel('time')
-                    axis[i].set_ylabel(metric_l2)
-                    axis[i].set_title(metric_l2)
+                metric_l1=metric_path[0]
+                if metric_path[0]=='ue':
+                   metric_l2=metric_path[1]
+                   major_ticks = np.arange(0, 10, 1)
+                   for rnti in self.d[node_type]['rntis']:
+                       tput = ''
+                       if 'mbps' in metric_l2:
+                          n = self.d[node_type]['test_params']['duration']
+                          top_n = (sorted(self.d[node_type]['rntis'][rnti][metric_l2])[-n:])
+                          tput = str(round(sum(top_n)/n,1))
+                          tput = ' '+tput+' Mbps'
+                       axis[i].plot(self.d[node_type]['rntis'][rnti][metric_l2],label=rnti+tput)
+                       major_ticks = np.arange(0, len(self.d[node_type]['rntis'][rnti][metric_l2])+1, 1)
+                       axis[i].set_xticks(major_ticks)
+                   axis[i].set_xticklabels([])
+                   axis[i].grid(axis='y')
+                   axis[i].legend(loc='center left')
+                   axis[i].set_xlabel('time (s)')
+                   axis[i].set_ylabel(metric_l2)
+
+                else:
+                   if len(metric_path)==1:#1 level
+                       major_ticks = np.arange(0, len(self.d[node_type][metric_l1])+1, 1)
+                       axis[i].set_xticks(major_ticks)
+                       axis[i].set_xticklabels([])
+                       axis[i].plot(self.d[node_type][metric_l1],marker='o')
+                       axis[i].set_xlabel('time')
+                       axis[i].set_ylabel(metric_l1)
+                       axis[i].set_title(metric_l1)
+
+                   else:#2 levels
+                       metric_l2=metric_path[1]
+                       major_ticks = np.arange(0, len(self.d[node_type][metric_l1][metric_l2])+1, 1)
+                       axis[i].set_xticks(major_ticks)
+                       axis[i].set_xticklabels([])
+                       axis[i].plot(self.d[node_type][metric_l1][metric_l2],marker='o')
+                       axis[i].set_xlabel('time')
+                       axis[i].set_ylabel(metric_l2)
+                       axis[i].set_title(metric_l2)
                 i+=1                
 
             plt.tight_layout()
             #save as png
+            #plt.show()
             plt.savefig(node_type+'_stats_monitor_'+testcase_id+'_'+page+'.png')
 
 
@@ -128,11 +203,13 @@ if __name__ == "__main__":
     CMD='ps aux | grep modem | grep -v grep'
     process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
     output = process.stdout.readlines()
-    while len(output)!=0 :
+    while True:
         mon.collect(testcase_id,node)
         process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
         output = process.stdout.readlines()
         time.sleep(1)
+        if len(output)==0 :
+           break;
     print('Process stopped')
     with open(node+'_stats_monitor.pickle', 'wb') as handle:
         pickle.dump(mon.d, handle, protocol=pickle.HIGHEST_PROTOCOL)

ci-scripts/stats_monitor_conf.yaml

@@ -1,4 +1,7 @@
 enb :
+  files: ["L1_stats.log", "MAC_stats.log", "PDCP_stats.log", "RRC_stats.log"]
+  test_params:
+    duration: 10 #Number of samples to average over for throughput
   PHR:
   bler:
   mcsoff:
@@ -11,10 +14,25 @@ enb :
       mcs:      
 
 gnb :
-  dlsch_err:
-  dlsch_err_perc_round_1:
-  ulsch_err:
-  ulsch_err_perc_round_1:
+  #files: ["nrL1_stats.log", "nrMAC_stats.log", "nrPDCP_stats.log", "nrRRC_stats.log"]
+  files: ["oai.log"]
+  test_params:
+    duration: 10 #Number of samples to average over for throughput
+  ue :
+    timestamp:
+    dlsch_bler:
+    dlsch_mbps:
+    dlsch_prev_bytes:
+    dlmcs:
+    dlbler:
+    dlsch_err:
+    dlsch_err_perc_round_1:
+    ulmcs:
+    ulbler:
+    ulsch_mbps:
+    ulsch_prev_bytes:
+    ulsch_err:
+    ulsch_err_perc_round_1:
   rt :
     feprx:
     feptx_prec:
@@ -29,10 +47,14 @@ gnb :
     Slot Indication:
   graph : 
     page1:
-      dlsch_err:
-      dlsch_err_perc_round_1:
-      ulsch_err:
-      ulsch_err_perc_round_1:
+      ue.dlsch_mbps:
+      #ue.dlsch_err:
+      ue.dlmcs:
+      ue.dlsch_err_perc_round_1:
+      ue.ulsch_mbps:
+      ue.ulmcs:
+       #ue.ulsch_err:
+      ue.ulsch_err_perc_round_1:
     page2:    
       rt.feprx:
       rt.feptx_prec:

ci-scripts/xml_files/container_sa_aerial_quectel.xml

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

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

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

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml

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

ci-scripts/xml_files/sa_cn5g_20897_closure.xml

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

ci-scripts/xml_files/sa_cn5g_20897_start.xml

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

ci-scripts/xml_files/sa_cn5g_closure.xml

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

ci-scripts/xml_files/sa_cn5g_start.xml

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

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

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

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

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

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

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

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

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

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

@@ -14,35 +14,35 @@
 
 ![Docker deploy 7.2](../../../doc/images/docker-deploy-oai-7-2.png)
 
-This docker-compose is designed to use `OAI-gNB` with a 7.2 compatible Radio Unit. Before using this docker compose you have to configure
-the host machine as per the [ORAN_FHI7.2_Tutorial](../../../doc/ORAN_FHI7.2_Tutorial.md). The container image used by the docker compose file is tested only on `Ubuntu 22.04` and `RHEL 9.4` docker host.
+This docker-compose is designed to use `OAI-gNB` with a 7.2 compatible Radio Unit. Before using this docker compose you have to configure 
+the host machine as per the [ORAN_FHI7.2_Tutorial](../../../doc/ORAN_FHI7.2_Tutorial.md). The container image used by the docker compose file is tested only on `Ubuntu 22.04` docker host. 
 
 ## Build Image (Optional)
 
 Refer to [OAI Docker/Podman Build and Usage Procedures](../../../docker/README.md)
 
-## Configure Networking
+## Configure Networking 
 
 ### SR-IOV Virtual Functions (VFs)
 
-In docker-compose environment there is no automated method
-to configure the VFs on the fly. The user will have to manually configure
-C/U plane VFs before starting the container `OAI-gNB`.
+In docker-compose environment there is no automated method 
+to configure the VFs on the fly. The user will have to manually configure 
+C/U plane VFs before starting the container `OAI-gNB`. 
 
-You can follow the step
+You can follow the step 
 [configure-network-interfaces-and-dpdk-vfs](../../../doc/ORAN_FHI7.2_Tutorial.md#configure-network-interfaces-and-dpdk-vfs).
 
 ### Interface towards AMF (N2)
 
-For `N2` interface we are using `macvlan` driver of docker.
+For `N2` interface we are using `macvlan` driver of docker. 
 
-You can use the `bridge` driver, in situation
+You can use the `bridge` driver, in situation 
 
-- When the core network is running on the same machine
-- or different machine but you have configured
-needed `ip route` and forwarding to access the core network from RAN host.
+- When the core network is running on the same machine 
+- or different machine but you have configured 
+needed `ip route` and forwarding to access the core network from RAN host.  
 
-To configure docker `macvlan` network
+To configure docker `macvlan` network 
 you need to choose `ipam.config` and `driver_opts.parent` are per your environment
 
 ```
@@ -59,7 +59,7 @@ you need to choose `ipam.config` and `driver_opts.parent` are per your environme
             parent: enp193s0f0
 ```
 
-To configure `bridge` network you need to choose `ipam.config.subnet` as per your environment.
+To configure `bridge` network you need to choose `ipam.config.subnet` as per your environment. 
 
 ```
     oai-net:
@@ -74,7 +74,7 @@ To configure `bridge` network you need to choose `ipam.config.subnet` as per you
 
 ## Deploy OAI-gNB Container
 
-The [configuration file](../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf) used by docker compose is configured for VVDN RU.
+The [configuration file](../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel650.conf) used  by docker compose is configured for Benetel 650 RU (RAN650-1v1.0.4-dda1bf5). 
 
 ```bash
 docker-compose up -d

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

@@ -1,23 +1,17 @@
 services:
     oai-gnb:
         image: oai-gnb-fhi72:latest
-        cap_add:
-            - SYS_ADMIN
-            - IPC_LOCK
-            - SYS_NICE
-        cap_drop:
-            - ALL
+        privileged: true
         container_name: oai-gnb
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 6,7,8,9
+            USE_ADDITIONAL_OPTIONS: --sa --thread-pool 13,14,15,16,17,18
         devices:
             - /dev/vfio:/dev/vfio/
         volumes:
-            - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel650.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev/hugepages:/dev/hugepages
-        # Please change these values based on your system
-        cpuset: "0,1,2,3,4,5,6,7,8,9"
+        cpuset: "0,1,2,8,9,10,13,14,15,16,17,18"
         networks:
             oai-net:
                 ipv4_address: 172.21.18.20
@@ -37,4 +31,4 @@ networks:
                   gateway: "172.21.19.254"
         driver_opts:
             com.docker.network.bridge.name: "oai-net"
-            parent: ens7f0
+            parent: enp193s0f0

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

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

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

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

cmake_targets/build_oai

@@ -46,7 +46,7 @@ BUILD_DOXYGEN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t2 ldpc_xdma websrv oai_iqplayer"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t2 websrv oai_iqplayer"
 TARGET_LIST=""
 
 function print_help() {
@@ -85,7 +85,7 @@ Options:
 --RU
   Makes the OAI RRU
 --UE
-   Makes the UE specific parts (usim, nvram) from the given configuration file
+   Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
 --nrUE
   Makes the NR UE softmodem
 --UE-conf-nvram [configuration file]
@@ -271,6 +271,9 @@ function main() {
        --UE-gen-nvram)
             gen_nvram_path=$(readlink -f "$2")
             shift 2;;
+       --UE-ip)
+            TARGET_LIST="$TARGET_LIST ue_ip"
+            shift;;
        -w | --hardware)
             case "$2" in
                 "USRP" | "BLADERF" | "LMSSDR" | "IRIS")

cmake_targets/tools/build_helper

@@ -171,6 +171,10 @@ clean_kernel() {
     $SUDO iptables -t filter -F
     $SUDO iptables -t raw -F
     echo_info "Flushed iptables"
+    $SUDO rmmod nasmesh > /dev/null 2>&1
+    $SUDO rmmod oai_nw_drv  > /dev/null 2>&1
+    $SUDO rmmod ue_ip > /dev/null 2>&1
+    echo_info "removed drivers from kernel"
 }
 
 clean_all_files() {
@@ -265,14 +269,6 @@ install_usrp_uhd_driver_from_source(){
             # - 3.15.0.0
             git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff
             ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
-        elif [[ "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then
-            # Tested that patch for the following versions:
-            # - 4.7.0.0
-            cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            sed -i '9,13 s/STATE_OFF/STATE_RX1_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            sed -i '24,28 s/STATE_OFF/STATE_RX2_OFF/' $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
-            ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
         else
             # Tested that patch for the following versions:
             # - 4.0.0.0

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

common/config/DOC/config/rtusage.md

@@ -68,6 +68,7 @@ To get help on supported parameters you can use specific options:
     --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'
     --nbiot-disable: disable nb-iot, even if defined in config
     --noS1: Disable s1 interface
+    --nokrnmod: (noS1 only): Use tun instead of namesh module
 --------------------------------------------------------------------
 
 [LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value)

common/utils/CMakeLists.txt

@@ -13,6 +13,6 @@ add_subdirectory(T)
 add_subdirectory(nr)
 add_subdirectory(LOG)
 add_subdirectory(threadPool)
-add_library(utils utils.c system.c time_meas.c time_stat.c tun_if.c)
+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/T/T_messages.txt

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

common/utils/nr/nr_common.c

@@ -105,16 +105,6 @@ int get_supported_band_index(int scs, frequency_range_t freq_range, int n_rbs)
   return (-1); // not found
 }
 
-int get_smallest_supported_bandwidth_index(int scs, frequency_range_t frequency_range, int n_rbs)
-{
-  int scs_index = scs + frequency_range;
-  for (int i = 0; i < 12; i++) {
-    if (n_rbs <= tables_5_3_2[scs_index][i])
-      return i;
-  }
-  return -1; // not found
-}
-
 // Table 5.2-1 NR operating bands in FR1 & FR2 (3GPP TS 38.101)
 // Table 5.4.2.3-1 Applicable NR-ARFCN per operating band in FR1 & FR2 (3GPP TS 38.101)
 // Notes:
@@ -309,30 +299,64 @@ void check_ssb_raster(uint64_t freq, int band, int scs)
               band);
 }
 
-int get_supported_bw_mhz(frequency_range_t frequency_range, int bw_index)
+int get_supported_bw_mhz(frequency_range_t frequency_range, int scs, int nb_rb)
 {
+  int bw_index = get_supported_band_index(scs, frequency_range, nb_rb);
   if (frequency_range == FR1) {
-    int bandwidth_index_to_mhz[] = {5, 10, 15, 20, 25, 30, 40, 50, 60, 80, 90, 100};
-    AssertFatal(bw_index >= 0 && bw_index <= sizeofArray(bandwidth_index_to_mhz),
-                "Bandwidth index %d is invalid\n",
-                bw_index);
-    return bandwidth_index_to_mhz[bw_index];
-  } else {
-    int bandwidth_index_to_mhz[] = {50, 100, 200, 400};
-    AssertFatal(bw_index >= 0 && bw_index <= sizeofArray(bandwidth_index_to_mhz),
-                "Bandwidth index %d is invalid\n",
-                bw_index);
-    return bandwidth_index_to_mhz[bw_index];
+    switch (bw_index) {
+      case 0 :
+        return 5; // 5MHz
+      case 1 :
+        return 10;
+      case 2 :
+        return 15;
+      case 3 :
+        return 20;
+      case 4 :
+        return 25;
+      case 5 :
+        return 30;
+      case 6 :
+        return 40;
+      case 7 :
+        return 50;
+      case 8 :
+        return 60;
+      case 9 :
+        return 80;
+      case 10 :
+        return 90;
+      case 11 :
+        return 100;
+      default :
+        AssertFatal(false, "Invalid band index for FR1 %d\n", bw_index);
+    }
+  }
+  else {
+    switch (bw_index) {
+      case 0 :
+        return 50; // 50MHz
+      case 1 :
+        return 100;
+      case 2 :
+        return 200;
+      case 3 :
+        return 400;
+      default :
+        AssertFatal(false, "Invalid band index for FR2 %d\n", bw_index);
+    }
   }
 }
 
-bool compare_relative_ul_channel_bw(int nr_band, int scs, int channel_bandwidth, frame_type_t frame_type)
+bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_t frame_type)
 {
   // 38.101-1 section 6.2.2
   // Relative channel bandwidth <= 4% for TDD bands and <= 3% for FDD bands
   int index = get_nr_table_idx(nr_band, scs);
+
+  int band_size_khz = get_supported_bw_mhz(nr_band > 256 ? FR2 : FR1, scs, nb_ul) * 1000;
   float limit = frame_type == TDD ? 0.04 : 0.03;
-  float rel_bw = (float) (2 * channel_bandwidth * 1000) / (float) (nr_bandtable[index].ul_max - nr_bandtable[index].ul_min);
+  float rel_bw = (float) (band_size_khz) / (float) (nr_bandtable[index].ul_max - nr_bandtable[index].ul_min);
   return rel_bw > limit;
 }
 

common/utils/nr/nr_common.h

@@ -38,10 +38,9 @@
 #include "assertions.h"
 #include "PHY/defs_common.h"
 
-#define NR_MAX_PDSCH_TBS 3824
 #define MAX_BWP_SIZE 275
 #define NR_MAX_NUM_BWP 4
-#define NR_MAX_HARQ_PROCESSES 32
+#define NR_MAX_HARQ_PROCESSES 16
 #define NR_NB_REG_PER_CCE 6
 #define NR_NB_SC_PER_RB 12
 #define NR_MAX_NUM_LCID 32
@@ -225,8 +224,8 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports);
 uint16_t SL_to_bitmap(int startSymbolIndex, int nrOfSymbols);
 int get_nb_periods_per_frame(uint8_t tdd_period);
 long rrc_get_max_nr_csrs(const int max_rbs, long b_SRS);
-bool compare_relative_ul_channel_bw(int nr_band, int scs, int channel_bandwidth, frame_type_t frame_type);
-int get_supported_bw_mhz(frequency_range_t frequency_range, int bw_index);
+bool compare_relative_ul_channel_bw(int nr_band, int scs, int nb_ul, frame_type_t frame_type);
+int get_supported_bw_mhz(frequency_range_t frequency_range, int scs, int nb_rb);
 int get_supported_band_index(int scs, frequency_range_t freq_range, int n_rbs);
 void get_samplerate_and_bw(int mu,
                            int n_rb,
@@ -249,7 +248,6 @@ int get_scan_ssb_first_sc(const double fc,
                           nr_gscn_info_t ssbStartSC[MAX_GSCN_BAND]);
 
 void check_ssb_raster(uint64_t freq, int band, int scs);
-int get_smallest_supported_bandwidth_index(int scs, frequency_range_t frequency_range, int n_rbs);
 
 #define CEILIDIV(a,b) ((a+b-1)/b)
 #define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))

common/utils/telnetsrv/telnetsrv_5Gue_measurements.c

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

common/utils/telnetsrv/telnetsrv_cpumeasur_def.h

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

common/utils/tun_if.c

@@ -1,283 +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 <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <linux/ipv6.h>
-#include <linux/if_tun.h>
-#include <linux/netlink.h>
-
-#include "tun_if.h"
-#include "common/platform_constants.h"
-#include "common/utils/LOG/log.h"
-#include "common/utils/system.h"
-
-int nas_sock_fd[MAX_MOBILES_PER_ENB * 2]; // Allocated for both LTE UE and NR UE.
-int nas_sock_mbms_fd;
-
-static int tun_alloc(char *dev)
-{
-  struct ifreq ifr;
-  int fd, err;
-
-  if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
-    LOG_E(UTIL, "failed to open /dev/net/tun\n");
-    return -1;
-  }
-
-  memset(&ifr, 0, sizeof(ifr));
-  /* Flags: IFF_TUN   - TUN device (no Ethernet headers)
-   *        IFF_TAP   - TAP device
-   *
-   *        IFF_NO_PI - Do not provide packet information
-   */
-  ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
-
-  if (*dev)
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name) - 1);
-
-  if ((err = ioctl(fd, TUNSETIFF, (void *)&ifr)) < 0) {
-    close(fd);
-    return err;
-  }
-
-  strcpy(dev, ifr.ifr_name);
-  return fd;
-}
-
-int tun_init_mbms(char *ifprefix, int id)
-{
-  int ret;
-  char ifname[64];
-
-  sprintf(ifname, "%s%d", ifprefix, id);
-  nas_sock_mbms_fd = tun_alloc(ifname);
-
-  if (nas_sock_mbms_fd == -1) {
-    LOG_E(UTIL, "Error opening mbms socket %s (%d:%s)\n", ifname, errno, strerror(errno));
-    exit(1);
-  }
-
-  LOG_D(UTIL, "Opened socket %s with fd %d\n", ifname, nas_sock_mbms_fd);
-  ret = fcntl(nas_sock_mbms_fd, F_SETFL, O_NONBLOCK);
-
-  if (ret == -1) {
-    LOG_E(UTIL, "Error fcntl (%d:%s)\n", errno, strerror(errno));
-    return 0;
-  }
-
-  struct sockaddr_nl nas_src_addr = {0};
-  nas_src_addr.nl_family = AF_NETLINK;
-  nas_src_addr.nl_pid = 1;
-  nas_src_addr.nl_groups = 0; /* not in mcast groups */
-  ret = bind(nas_sock_mbms_fd, (struct sockaddr *)&nas_src_addr, sizeof(nas_src_addr));
-
-  return 1;
-}
-
-int tun_init(const char *ifprefix, int num_if, int id)
-{
-  int ret;
-  char ifname[64];
-
-  int begx = (id == 0) ? 0 : id - 1;
-  int endx = (id == 0) ? num_if : id;
-  for (int i = begx; i < endx; i++) {
-    sprintf(ifname, "%s%d", ifprefix, i + 1);
-    nas_sock_fd[i] = tun_alloc(ifname);
-
-    if (nas_sock_fd[i] == -1) {
-      LOG_E(UTIL, "Error opening socket %s (%d:%s)\n", ifname, errno, strerror(errno));
-      return 0;
-    }
-
-    LOG_I(UTIL, "Opened socket %s with fd nas_sock_fd[%d]=%d\n", ifname, i, nas_sock_fd[i]);
-    ret = fcntl(nas_sock_fd[i], F_SETFL, O_NONBLOCK);
-
-    if (ret == -1) {
-      LOG_E(UTIL, "Error fcntl (%d:%s)\n", errno, strerror(errno));
-
-      return 0;
-    }
-  }
-
-  return 1;
-}
-
-/*
- * \brief set a genneric interface parameter
- * \param ifn the name of the interface to modify
- * \param if_addr the address that needs to be modified
- * \param operation one of SIOCSIFADDR (set interface address), SIOCSIFNETMASK
- *   (set network mask), SIOCSIFBRDADDR (set broadcast address), SIOCSIFFLAGS
- *   (set flags)
- * \return true on success, false otherwise
- */
-static bool setInterfaceParameter(int sock_fd, const char *ifn, int af, const char *if_addr, int operation)
-{
-  DevAssert(af == AF_INET || af == AF_INET6);
-  struct ifreq ifr = {0};
-  strncpy(ifr.ifr_name, ifn, sizeof(ifr.ifr_name));
-  struct in6_ifreq ifr6 = {0};
-
-  void *ioctl_opt = NULL;
-  if (af == AF_INET) {
-    struct sockaddr_in addr = {.sin_family = AF_INET};
-    int ret = inet_pton(af, if_addr, &addr.sin_addr);
-    if (ret != 1) {
-      LOG_E(OIP, "inet_pton(): cannot convert %s to IPv4 network address\n", if_addr);
-      return false;
-    }
-    memcpy(&ifr.ifr_ifru.ifru_addr,&addr,sizeof(struct sockaddr_in));
-    ioctl_opt = &ifr;
-  } else {
-    struct sockaddr_in6 addr6 = {.sin6_family = AF_INET6};
-    int ret = inet_pton(af, if_addr, &addr6.sin6_addr);
-    if (ret != 1) {
-      LOG_E(OIP, "inet_pton(): cannot convert %s to IPv6 network address\n", if_addr);
-      return false;
-    }
-    memcpy(&ifr6.ifr6_addr, &addr6.sin6_addr, sizeof(struct in6_addr));
-    // we need to get the if index to put it into ifr6
-    if (ioctl(sock_fd, SIOGIFINDEX, &ifr) < 0) {
-      LOG_E(OIP, "ioctl() failed: errno %d, %s\n", errno, strerror(errno));
-      return false;
-    }
-    ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-    ifr6.ifr6_prefixlen = 64;
-    ioctl_opt = &ifr6;
-  }
-
-  bool success = ioctl(sock_fd, operation, ioctl_opt) == 0;
-  if (!success)
-    LOG_E(OIP, "Setting operation %d for %s: ioctl call failed: %d, %s\n", operation, ifn, errno, strerror(errno));
-  return success;
-}
-
-/*
- * \brief bring interface up (up != 0) or down (up == 0)
- */
-typedef enum { INTERFACE_DOWN, INTERFACE_UP } if_action_t;
-static bool change_interface_state(int sock_fd, const char *ifn, if_action_t if_action)
-{
-  const char* action = if_action == INTERFACE_DOWN ? "DOWN" : "UP";
-
-  struct ifreq ifr = {0};
-  strncpy(ifr.ifr_name, ifn, sizeof(ifr.ifr_name));
-  /* get flags of this interface: see netdevice(7) */
-  bool success = ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t)&ifr) == 0;
-  if (!success)
-    goto fail_interface_state;
-
-  if (if_action == INTERFACE_UP) {
-    ifr.ifr_flags |= IFF_UP | IFF_NOARP | IFF_POINTOPOINT;
-    ifr.ifr_flags &= ~IFF_MULTICAST;
-  } else {
-    ifr.ifr_flags &= ~IFF_UP;
-  }
-
-  success = ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t)&ifr) == 0;
-  if (!success)
-    goto fail_interface_state;
-  return true;
-
-fail_interface_state:
-  LOG_E(OIP, "Bringing interface %s for %s: ioctl call failed: %d, %s\n", action, ifn, errno, strerror(errno));
-  return false;
-}
-
-// non blocking full configuration of the interface (address, and the two lest octets of the address)
-bool tun_config(int interface_id, const char *ipv4, const char *ipv6, const char *ifpref)
-{
-  char interfaceName[IFNAMSIZ];
-  snprintf(interfaceName, sizeof(interfaceName), "%s%d", ifpref, interface_id);
-
-  AssertFatal(ipv4 != NULL || ipv6 != NULL, "need to have IP address, but none given\n");
-
-  int sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-  if (sock_fd < 0) {
-    LOG_E(UTIL, "Failed creating socket for interface management: %d, %s\n", errno, strerror(errno));
-    return false;
-  }
-
-  change_interface_state(sock_fd, interfaceName, INTERFACE_DOWN);
-  bool success = true;
-  if (ipv4 != NULL)
-    success = setInterfaceParameter(sock_fd, interfaceName, AF_INET, ipv4, SIOCSIFADDR);
-  // set the machine network mask for IPv4
-  if (success && ipv4 != NULL)
-    success = setInterfaceParameter(sock_fd, interfaceName, AF_INET, "255.255.255.0", SIOCSIFNETMASK);
-
-  if (ipv6 != NULL) {
-    // for setting the IPv6 address, we need an IPv6 socket. For setting IPv4,
-    // we need an IPv4 socket. So do all operations using IPv4 socket, except
-    // for setting the IPv6
-    int sock_fd = socket(AF_INET6, SOCK_DGRAM, 0);
-    if (sock_fd < 0) {
-      LOG_E(UTIL, "Failed creating socket for interface management: %d, %s\n", errno, strerror(errno));
-      success = false;
-    }
-    success = success && setInterfaceParameter(sock_fd, interfaceName, AF_INET6, ipv6, SIOCSIFADDR);
-    close(sock_fd);
-  }
-
-  if (success)
-    success = change_interface_state(sock_fd, interfaceName, INTERFACE_UP);
-
-  if (success)
-    LOG_I(OIP, "Interface %s successfully configured, IPv4 %s, IPv6 %s\n", interfaceName, ipv4, ipv6);
-  else
-    LOG_E(OIP, "Interface %s couldn't be configured (IPv4 %s, IPv6 %s)\n", interfaceName, ipv4, ipv6);
-
-  close(sock_fd);
-  return success;
-}
-
-void setup_ue_ipv4_route(int interface_id, const char *ipv4, const char *ifpref)
-{
-  int table_id = interface_id - 1 + 10000;
-  char interfaceName[IFNAMSIZ];
-  snprintf(interfaceName, sizeof(interfaceName), "%s%d", ifpref, interface_id);
-
-  char command_line[500];
-  int res = sprintf(command_line,
-                    "ip rule add from %s/32 table %d && "
-                    "ip rule add to %s/32 table %d && "
-                    "ip route add default dev %s table %d",
-                    ipv4,
-                    table_id,
-                    ipv4,
-                    table_id,
-                    interfaceName,
-                    table_id);
-
-  if (res < 0) {
-    LOG_E(UTIL, "Could not create ip rule/route commands string\n");
-    return;
-  }
-  background_system(command_line);
-}
-

common/utils/tun_if.h

@@ -1,63 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-#ifndef TUN_IF_H_
-#define TUN_IF_H_
-
-#include <stdbool.h>
-
-/* TODO: doc */
-int tun_init(const char *ifprefix, int num_if, int id);
-
-/* TODO: doc */
-int tun_init_mbms(char *ifsuffix, int id);
-
-/*! \fn int  tun_config(char*, int, int)
- * \brief This function initializes the nasmesh interface using the basic values,
- * basic address, network mask and broadcast address, as the default configured
- * ones
- * \param[in] interface_id number of this interface, prepended after interface
- * name
- * \param[in] ipv4 IPv4 address of this interface as a string
- * \param[in] ipv6 IPv6 address of this interface as a string
- * \param[in] ifprefix interface name prefix to which an interface number will
- * be appended
- * \return true on success, otherwise false
- * \note
- * @ingroup  _nas
- */
-bool tun_config(int interface_id, const char *ipv4, const char *ipv6, const char *ifprefix);
-
-/*!
- * \brief Setup a IPv4 rule in table (interface_id - 1 + 10000) and route to
- * force packets coming into interface back through it, and workaround
- * net.ipv4.conf.all.rp_filter=2 (strict source filtering would filter out
- * responses of packets going out through interface to another IP address not
- * in same subnet).
- * \param[in] interface_id number of this interface, prepended after interface
- * name
- * \param[in] ipv4 IPv4 address of the UE
- * \param[in] ifprefix interface name prefix to which an interface number will
- * be appended
- */
-void setup_ue_ipv4_route(int interface_id, const char *ipv4, const char *ifpref);
-
-#endif /*TUN_IF_H_*/

doc/BUILD.md

@@ -38,6 +38,7 @@ Running the  [build_oai](../cmake_targets/build_oai) script also generates some
 
 - `conf2uedata`: a binary used to build the (4G) UE data from a configuration file. The created file emulates the sim card  of a 3GPP compliant phone.
 - `nvram`: a binary used to build (4G) UE (IMEI...) and EMM (IMSI, registered PLMN) non volatile data.
+- `rb_tool`: radio bearer utility for (4G) UE
 - `genids` T Tracer utility, used at build time to generate `T_IDs.h` include file. This binary is located in the [T Tracer source file directory](../common/utils/T) .
 
 The build system for OAI uses [cmake](https://cmake.org/) which is a  tool to generate makefiles. The `build_oai` script is a wrapper using `cmake` and `make`/`ninja` to ease the oai build and use. It logs the `cmake` and `ninja`/`make` commands it executes. The file describing how to build the executables from source files is the [CMakeLists.txt](../CMakeLists.txt), it is used as input by cmake to generate the makefiles.

doc/Doxyfile

@@ -866,8 +866,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_cmdline.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/oai_asn1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/system.h \
@@ -1876,6 +1874,10 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/L2_interface_ue.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_internode.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_if.h \
@@ -2306,6 +2308,13 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_freq_equalization.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/proto.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/adc.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/dac.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.h \

doc/FEATURE_SET.md

@@ -70,7 +70,7 @@ These modes of operation are supported:
    - DMRS configuration type 1 and 2
    - Single and multiple DMRS symbols
    - PTRS support
-   - Support for up to 4 TX antennas
+   - Support for 1, 2 and 4 TX antennas
    - Support for up to 2 layers
    - Support for 256 QAM
 *  NR-CSIRS Generation of sequence at PHY
@@ -79,7 +79,7 @@ These modes of operation are supported:
    - DMRS configuration type 1 and 2
    - Single and multiple DMRS symbols
    - PTRS support
-   - Support for up to 4 RX antennas
+   - Support for up to 2 RX antenna
    - Support for up to 2 layers
    - Support for 256 QAM
 *  NR-PUCCH
@@ -205,7 +205,6 @@ These modes of operation are supported:
   - F1 UE Context modification required
   - F1 UE Context release req/cmd/complete
   - F1 gNB CU configuration update
-  - F1 Reset (handled at DU only, full reset only)
 - Interface with RRC
 - Interface with GTP-u (tunnel creation/handling for F1-U interface)
 - One CU(-CP) can handle multiple DUs
@@ -238,8 +237,7 @@ These modes of operation are supported:
 ##  NR UE PHY Layer ##
 
 *  Initial synchronization
-   - non-blind synchronization (information required: carrier frequency, bandwidth, numerology)
-   - option to search SSB inside the bandwidth available
+   - the UE needs to know the position in frequency of the SSBs (via command line parameter in SA)
 *  Time tracking based on PBCH DMRS
 *  Frequency offset estimation based on PSS and SSS
 *  15kHz and 30kHz SCS for FR1 and 120 kHz SCS for FR2
@@ -294,7 +292,7 @@ These modes of operation are supported:
 
 *  MAC -> PHY configuration via UE FAPI P5 interface
 *  Basic MAC to control PHY via UE FAPI P7 interface
-*  PHY -> MAC indication
+*  PHY -> MAC indication (needs some improvement)
 
 ## NR UE Higher Layers ##
 
@@ -316,21 +314,19 @@ These modes of operation are supported:
    - format 01 (C-RNTI)
 * UCI processing
    - ACK/NACK processing
-   - Scheduling request procedures
-   - CSI measurement reporting (periodic and aperiodic)
+   - Triggering periodic SR
+   - CSI measurement reporting
 * DLSCH scheduler
    - Configuration of fapi PDU according to DCI
    - HARQ procedures
 * ULSCH scheduler
    - Configuration of fapi PDU according to DCI
-   - Buffer status reporting procedures
    - Logical channel prioritization of 'data from any logical channel'
-   - UCI on PUSCH
 * NR-CSIRS scheduler
   - Scheduling of NR-CSIRS reception
   - Fill UCI for CSI measurement reporting
 * Scheduler procedures for SRS transmission
-   - Periodic and aperiodic SRS transmission
+   - Periodic SRS transmission
 * Bandwidth part (BWP) operation
    - Operation in configured dedicated BWP through RRCSetup or RRCReconfiguration
 
@@ -367,7 +363,6 @@ These modes of operation are supported:
    - RRCSetupRequest/RRCSetup/RRCSetupComplete
    - RRC Uplink/Downlink Information transfer carrying NAS messages transparently
    - RRC Reconfiguration/Reconfiguration complete
-   - RRCReestablishmentRequest/RRC Reestablishment/Reestablishment complete
    - Support for master cell group configuration
    - Reception of UECapabilityEnquiry, encoding and transmission of UECapability
 * Interface with PDCP: configuration, DCCH and CCCH message handling

doc/L1SIM.md

@@ -45,7 +45,7 @@ $ source oaienv
 $ cd cmake_targets/tools
 $ sudo -E ./init_nas_nos1 eNB
 $ cd ../ran_build/build
-$ sudo -E ./lte-softmodem -O YYY.conf --noS1
+$ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0
 ```
 
 # How to run a UE with the noS1 option
@@ -59,7 +59,7 @@ $ source oaienv
 $ cd cmake_targets/tools
 $ sudo -E ./init_nas_nos1 UE
 $ cd ../ran_build/build
-$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1
+$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0
 ```
 
 That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 

doc/LDPC_T2_OFFLOAD_SETUP.md

@@ -74,6 +74,11 @@ If DPDK library was installed into custom path, you have to point to the right d
 ```
 export PKG_CONFIG_PATH=/opt/dpdk-t2/lib64/pkgconfig/:$PKG_CONFIG_PATH
 ```
+## Setup of T2-related DPDK EAL parameters
+To configure T2-related DPDK Environment Abstraction Layer (EAL) parameters, you can set the following parameters via the command line:
+- `ldpc_offload.dpdk_dev` - **mandatory** parameter, specifies PCI address of the T2 card. PCI address of the T2 card can be detected by `lspci | grep "Xilinx"` command.
+- `ldpc_offload.dpdk_cores_list` - CPU cores assigned to DPDK for T2 processing, by default set to *11-12*. Ensure that the CPU cores specified in *ldpc_offload.dpdk_cores_list* are available and not used by other processes to avoid conflicts.
+- `ldpc_offload.dpdk_prefix` - DPDK shared data file prefix, by default set to *b6*
 
 # OAI Build
 OTA deployment is precisely described in the following tutorial:
@@ -97,39 +102,18 @@ cd cmake_targets
 ./build_oai -w USRP --ninja --gNB -P --build-lib "ldpc_t2" -C
 ```
 
-Shared object file *libldpc_slot_t2.so* is created during the compilation. This object is conditionally compiled. Selection of the library to compile is done using *--build-lib ldpc_t2*.
+Shared object file *libldpc_t2.so* is created during the compilation. This object is conditionally compiled. Selection of the library to compile is done using *--build-lib ldpc_t2*.
 
 *Required poll mode driver has to be present on the host machine and required DPDK version has to be installed on the host, prior to the build of OAI*
 
-# Setup of T2-related DPDK EAL parameters
-To configure T2-related DPDK Environment Abstraction Layer (EAL) parameters, you can set the following parameters via the command line of PHY simulators or softmodem:
-- `nrLDPC_coding_t2.dpdk_dev` - **mandatory** parameter, specifies PCI address of the T2 card. PCI address of the T2 card can be detected by `lspci | grep "Xilinx"` command.
-- `nrLDPC_coding_t2.dpdk_core_list` - **mandatory** parameter, specifies CPU cores assigned to DPDK for T2 processing. Ensure that the CPU cores specified in *nrLDPC_coding_t2.dpdk_core_list* are available and not used by other processes to avoid conflicts.
-- `nrLDPC_coding_t2.dpdk_prefix` - DPDK shared data file prefix, by default set to *b6*.
-
-**Note:** These parameters can also be provided in a configuration file:
-```
-nrLDPC_coding_t2 : {
-  dpdk_dev : "41:00.0";
-  dpdk_core_list : "14-15";
-};
-
-loader : {
-  ldpc : {
-    shlibversion : "_slot_t2";
-  };
-};
-```
-
 # 5G PHY simulators
-
 ## nr_ulsim test
-Offload of the channel decoding to the T2 card is in nr_ulsim specified by *--loader.ldpc.shlibversion _slot_t2* option. Example command for running nr_ulsim with LDPC decoding offload to the T2 card:
+Offload of the channel decoding to the T2 card is in nr_ulsim specified by *-o* option. Example command for running nr_ulsim with LDPC decoding offload to the T2 card:
 ```
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr_ulsim -n100 -s20 -m20 -r273 -R273 --loader.ldpc.shlibversion _slot_t2 --nrLDPC_coding_t2.dpdk_dev 01:00.0 --nrLDPC_coding_t2.dpdk_core_list 0-1
+sudo ./nr_ulsim -n100 -s20 -m20 -r273 -R273 -o --ldpc_offload.dpdk_dev 01:00.0
 ```
 ## nr_dlsim test
 Offload of the channel encoding to the AMD Xilinx T2 card is in nr_dlsim specified by *-c* option. Example command for running nr_dlsim with LDPC encoding offload to the T2 card:
@@ -137,18 +121,18 @@ Offload of the channel encoding to the AMD Xilinx T2 card is in nr_dlsim specifi
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr_dlsim -n300 -s30 -R 106 -e 27 --loader.ldpc.shlibversion _slot_t2 --nrLDPC_coding_t2.dpdk_dev 01:00.0 --nrLDPC_coding_t2.dpdk_core_list 0-1
+sudo ./nr_dlsim -n300 -s30 -R 106 -e 27 -c --ldpc_offload.dpdk_dev 01:00.0
 ```
 
 # OTA test
-Offload of the channel encoding and decoding to the AMD Xilinx T2 card is enabled by *--loader.ldpc.shlibversion _slot_t2* option.
+Offload of the channel encoding and decoding to the AMD Xilinx T2 card is enabled by *--ldpc-offload-enable* option.
 
 ## Run OAI gNB with USRP B210
 ```
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr-softmodem --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --loader.ldpc.shlibversion _slot_t2 --nrLDPC_coding_t2.dpdk_dev 01:00.0 --nrLDPC_coding_t2.dpdk_core_list 0-1
+sudo ./nr-softmodem --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --ldpc-offload-enable --ldpc_offload.dpdk_dev 01:00.0
 ```
 
 # Limitations

doc/LDPC_XDMA_OFFLOAD_SETUP.md

@@ -1,155 +0,0 @@
-[TOC]
-
-This documentation aims to provide a tutorial for Xilinx FPGA PCIe-XDMA integration into OAI and its usage. It can offload LDPC decoding to FPGA.
-
-# Requirements
-
-- XDMA driver
-
-# XDMA Driver Build & Install
-
-The *xdma_driver* directory contains the following:
-
-```bash
-xdma_driver
-├── cmake
-├── FPGA_TEST_datasheet.txt
-├── include
-├── libfpga_0720_vt.so
-├── libfpga_8038_vt.so
-├── libfpga_ldpc.a
-├── libTHIRD_PARTY.a
-├── nr_ldpc_decoding_pym.h
-├── README.md
-├── tests
-├── xdma
-└── xdma_diag.h
-```
-
-Before building the driver, ensure that your system recognizes the Xilinx device. You can check this using the `lspci` command:
-
-```bash
-$ lspci | grep Xilinx
-01:00.0 Serial controller: Xilinx Corporation Device 8038
-```
-
-Building and Installing the Driver
-
-```
-cd xdma_driver/xdma
-sudo make clean
-sudo make install
-cd xdma_driver/tests
-sudo ./load_driver.sh
-```
-
-# OAI Build
-
-```bash
-# Get openairinterface5g source code
-git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterface5g
-cd ~/openairinterface5g
-
-# Install OAI dependencies
-cd ~/openairinterface5g/cmake_targets
-./build_oai -I
-
-# Build OAI gNB & UE
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets
-./build_oai --ninja -w SIMU --gNB --nrUE -P --build-lib "ldpc_xdma" -C -c
-```
-
-Shared object file *libldpc_xdma.so* is created during the compilation. This object is conditionally compiled. Selection of the library to compile is done using `--build-lib ldpc_xdma`. 
-
-# 5G PHY simulators
-
-The simulated test uses the option `--loader.ldpc.shlibversion _xdma` to select the XDMA version for loading into the LDPC interface. Additionally, the option `--nrLDPC_coding_xdma.num_threads_prepare` is used to specify the number of threads for preparing data before the LDPC processing, specifically for the deinterleaving and rate matching parts.
-
-Another way to activate the feature is to add the `slot_xdma.conf` file with the following content:
-
-```
-nrLDPC_coding_xdma : {
-  num_threads_prepare : 2;
-};
-
-loader : {
-  ldpc : {
-    shlibversion : "_xdma";
-  };
-};
-
-```
-
-and use option `-O slot_xdma.conf`. 
-
-## nr_ulsim test
-
-Example command for running nr_ulsim with LDPC decoding offload to the FPGA:
-
-```bash
-cd ~/openairinterface5g/cmake_targets/ran_build/build
-sudo ./nr_ulsim -n100 -m28 -r273 -R273 -s22 -I10 -C8 -P --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
-```
-
-or
-
-```
-sudo ./nr_ulsim -n100 -m28 -r273 -R273 -s22 -I10 -C8 -P -O slot_xdma.conf
-```
-
-# Run
-
-Both gNB and nrUE use the option `--loader.ldpc.shlibversion _xdma` to select the XDMA version for loading into the LDPC interface and `--nrLDPC_coding_xdma.num_threads_prepare` to specify the number of threads for preparing data before the LDPC processing, specifically for the deinterleaving and rate matching parts.
-
-Another way to activate the feature is to add the following content to the `.conf` file you want to use:
-
-```
-nrLDPC_coding_xdma : {
-  num_threads_prepare : 2;
-};
-
-loader : {
-  ldpc : {
-    shlibversion : "_xdma";
-  };
-};
-
-```
-
-and use option `-O *.conf`. 
-
-## gNB
-
-Example command using rfsim:
-
-```bash
-cd ~/openairinterface5g/cmake_targets/ran_build/build
-sudo ./nr-softmodem --sa --rfsim --log_config.global_log_options level,nocolor,time -O ../../../ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
-```
-
-or 
-
-```bash
-sudo ./nr-softmodem --sa --rfsim --log_config.global_log_options level,nocolor,time -O ../../../ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
-```
-
-if you have added the configuration to the `.conf` file.
-
-## UE
-
-Example command using rfsim:
-
-```bash
-cd ~/openairinterface5g/cmake_targets/ran_build/build
-sudo ./nr-uesoftmodem --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.serveraddr 10.201.1.100 --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
-```
-
-or 
-
-```bash
-sudo ./nr-uesoftmodem --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.serveraddr 10.201.1.100
-```
-
-if you have added the configuration to the `.conf` file.

doc/RUNMODEM.md

@@ -103,15 +103,12 @@ Command line parameters for UE in `--sa` mode:
 - `--ssb` : SSB start subcarrier (default value 516)
 
 **Optional parameters**:
-- `-E`: use three-quarter sampling for split 8 sample rate. Required for
-  certain radios (e.g., 40MHz with B210). If used on the gNB, it is a good idea
-  to use for the UE as well (and vice versa).
 - `--ue-scan-carrier` : scan for cells in current bandwidth. This option can be used if the SSB position of the gNB is unknown. If multiple cells are detected, the UE will try to connect to the first cell. By default, this option is disabled and the UE attempts to only decode SSB given by `--ssb`.
 
 To simplify the configuration for the user testing OAI UE with OAI gNB, the latter prints the following LOG that guides the user to correctly set some of the UE command line parameters.
 
 ```
-[PHY]   Command line parameters for OAI UE: -C 3319680000 -r 106 --numerology 1 --ssb 516
+[PHY]   Command line parameters for the UE: -C 3319680000 -r 106 --numerology 1 --ssb 516
 ```
 
 You can run this, using USRPs, on two separate machines:
@@ -205,14 +202,6 @@ cd cmake_targets
 sudo ./ran_build/build/nr-softmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf --sa --rfsim --rfsimulator.prop_delay 238.74
 ```
 
-To configure NTN gNB with 32 HARQ processes in downlink and uplink, add these settings in conf files under section `gNBs.[0]`
-```
-...
-    num_dlharq = 32;
-    num_ulharq = 32;
-...
-```
-
 ### NR UE
 
 At UE side, there are two main parameters to cope with the large NTN propagation delay, cellSpecificKoffset and ta-Common.
@@ -293,8 +282,8 @@ In do-ra mode it is possible to mimic the reception of UE Capabilities at gNB by
 To run using the RFsimulator:
 
 ```bash
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --do-ra --rfsim
-sudo ./nr-uesoftmodem --do-ra --rfsim --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --do-ra --rfsim --parallel-config PARALLEL_SINGLE_THREAD
+sudo ./nr-uesoftmodem --do-ra --rfsim --rfsimulator.serveraddr 127.0.0.1 --parallel-config PARALLEL_SINGLE_THREAD
 ```
 
 Using USRPs:

doc/RUN_NR_PRS.md

@@ -71,7 +71,7 @@ If **N310 USRPs** are used, then run above command `without -E option` i.e witho
 
 To run using **rfsimulator**, execute following command:  
 
-```sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf --noS1 --rfsim --phy-test```
+```sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf --parallel-config PARALLEL_SINGLE_THREAD --noS1 --rfsim --phy-test```
 
 ## FR2 test
 In FR2 mode, we need RF beamforming module to transmit signal in mmWave frequency range. **X310 USRPs** can be used with BasicTx daughtercard to transmit baseband signal at **Intermediate Frequncy(IF)** and then RF beamforming module would perform beamforming and the upconversion to FR2 frequencies. IF can be specified using `if_freq` in the RU section of gNB config.
@@ -83,7 +83,7 @@ If RF beamforming module is NOT present, gNB can still be launched with USRP alo
 
 To run using **rfsimulator**, execute following command:  
 
-```sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf --noS1 --rfsim --phy-test```
+```sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf --parallel-config PARALLEL_SINGLE_THREAD --noS1 --rfsim --phy-test```
 
 ## Multiple gNB scenario
 PRS is primarily used for positioning and localization of the UE with multiple gNBs transmitting simultaneously. OAI PRS implementation supports multiple gNB transmission provided all the gNBs are tightely synchronized using GPSDO clock. Therefore before running this scenario, make sure the USRPs has built-in GPSDO and the GPS antennas are connected with good satellite visibility. Also every time a gNB is launched, wait until `GPS LOCKED` is printed on the terminal during gNB startup. If USRP fails to lock with GPSDO, try again until its locked.

doc/SystemX-tutorial-design.md

@@ -133,7 +133,7 @@ Usage with RFsimulator:
 **gNB**
 
 ```bash
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --parallel-config PARALLEL\_SINGLE\_THREAD
 ```
 
 **nrUE**

doc/TESTBenches.md

@@ -22,8 +22,8 @@
 | nokiabox      | 172.21.19.39    | _None_                | gNB (Nokia), 5GC   | _Nokia RF integrated_                                 |
 | avra          | 172.21.16.124   | CI-Avra-Usage         | gNB (n78)          | AW2S Jaguar (192.168.80.239)                          |
 | orion         | 172.21.16.134   | CI-Orion-Build-Sanity-Check-Deploy-Test, CI-Orion-DsTester-Deploy-Test | Build | |
-| aerial2       | 172.21.16.131   | CI-Aerial2-Usage      | gNB (PNF/Nvidia CUBB + VNF) | Foxconn RU, _Nvidia Aerial SDK integrated_   |
-| sphex         | 172.21.17.54    | CI-Sphex-Usage        | COTS UE            | Quectel RM520N                                        |
+| aerial1       | 172.21.16.130   | CI-Aerial2-Usage      | gNB (PNF/Nvidia CUBB + VNF) | Foxconn RU, _Nvidia Aerial SDK integrated_   |
+| sphex         | 172.21.17.54    | CI-Sphex-Usage        | COTS UE            | Quectel RM500Q                                        |
 | matix         | 172.21.19.58    | CI-Matix-Usage        | gNB (n77)          | N310                                                  |
 
 Note: The available resources, and their current usage, is indicated here:
@@ -193,18 +193,12 @@ information on how the images are built.
   - OpenShift cluster for CN deployment and container images for gNB and UE deployment
 - [RAN-SA-AERIAL-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AERIAL-CN5G/)
   ~5G-NR
-  - 5G-NR SA test setup: OAI VNF  + PNF/NVIDIA CUBB on Aerial2 (U22) + Foxconn RU, sphex + COTS UE (Quectel RM520N), OAI CN5G
+  - 5G-NR SA test setup: OAI VNF  + PNF/NVIDIA CUBB on Aerial1 (U22) + Foxconn RU, sphex + COTS UE (Quectel RM500Q), OAI CN5G
   - container images for gNB deployment
 - [RAN-SA-2x2-Module-CN5G](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-SA-2x2-Module-CN5G/)
   ~5G-NR
   - matix + N310 (gNB), up2 + COTS UE (Quectel RM520N), OAI 5GC deployed in docker on matix
   - NR performance tests: 2x2 configuration, 60 MHz and 100 MHz bandwidth
-- [RAN-SA-FHI72-CN5G](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-SA-FHI72-CN5G/)
-  ~5G-NR
-  - cacofonix + FHI72 + Benetel550 (gNB), AmariUE, OAI CN5G
-  - cacofonix + FHI72 + VVDN (gNB), up2 (Quectel RM520N UE), OAI CN5G
-  - OpenShift cluster for CN deployment
-  - FHI 7.2 testing with 100 MHz bandwidth, 2 layers in DL
 
 ### RAN-CI-NSA-Trigger
 

doc/iqrecordplayer_usage.md

@@ -33,7 +33,7 @@ than the value of `--subframes-max` parameter.
 
 >Recording session example:
 ```bash
-./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000
+./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000
 ............................................
 ............................................
 ............................................
@@ -54,7 +54,7 @@ options for replay mode are:
 
 >Replay mode session example:
 ```bash
-./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1
+./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1
 ..................................
 ..................................
 [HW]   Replay iqs from USRP B200 device, bandwidth 4.000000e+07

doc/testing_gnb_w_cots_ue_resources/gnb.conf

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

docker/Dockerfile.base.rhel9

@@ -67,7 +67,7 @@ RUN rm -f /etc/rhsm-host && \
 
 # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
 # it will be copied into target containers, to print exit numbers and handle signals properly
-ENV TINI_VERSION=v0.19.0
+ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 

docker/Dockerfile.base.rocky

@@ -48,7 +48,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
 
 # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
 # it will be copied into target containers, to print exit numbers and handle signals properly
-ENV TINI_VERSION=v0.19.0
+ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 

docker/Dockerfile.base.ubuntu22

@@ -57,7 +57,7 @@ RUN apt-get update && \
 
 # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
 # it will be copied into target containers, to print exit numbers and handle signals properly
-ENV TINI_VERSION=v0.19.0
+ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 

docker/Dockerfile.base.ubuntu22.cross-arm64

@@ -74,7 +74,7 @@ RUN apt-get update && \
 
 # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
 # it will be copied into target containers, to print exit numbers and handle signals properly
-ENV TINI_VERSION=v0.19.0
+ENV TINI_VERSION v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 

docker/Dockerfile.build.fhi72.rhel9

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-base
+FROM ran-base:latest as ran-base
 ENV TZ=Europe
 
 RUN rm -Rf /oai-ran
@@ -48,7 +48,7 @@ RUN git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git /opt/phy && \
     cd /opt/phy/fhi_lib/lib && \
     RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 
 
-FROM ran-base AS ran-build-fhi72
+FROM ran-base as ran-build-fhi72
 ARG E2AP_VERSION=E2AP_V3
 ARG KPM_VERSION=KPM_V3_00
 

docker/Dockerfile.build.fhi72.ubuntu22

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-base
+FROM ran-base:latest as ran-base
 
 ARG E2AP_VERSION=E2AP_V3
 ARG KPM_VERSION=KPM_V3_00
@@ -61,7 +61,7 @@ RUN git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git /opt/phy && \
     cd /opt/phy/fhi_lib/lib && \
     RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 
 
-FROM ran-base AS ran-build-fhi72
+FROM ran-base as ran-build-fhi72
 ## Build and install OAI
 #run build_oai to build the target image
 RUN /bin/sh oaienv && \ 

docker/Dockerfile.build.rhel9

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran

docker/Dockerfile.build.rocky

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran

docker/Dockerfile.build.ubuntu22

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 ARG BUILD_OPTION
 
 RUN rm -Rf /oai-ran

docker/Dockerfile.build.ubuntu22.cross-arm64

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran

docker/Dockerfile.eNB.rhel9

@@ -31,7 +31,7 @@ FROM ran-build:latest AS enb-build
 
 
 #start from scratch for target executable
-FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-enb
+FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \

docker/Dockerfile.eNB.rocky

@@ -32,7 +32,7 @@ FROM ran-build:latest AS enb-build
 
 
 #start from scratch for target executable
-FROM $BASE_IMAGE AS oai-enb
+FROM $BASE_IMAGE as oai-enb
 ENV TZ=Europe/Paris
 
 RUN dnf update -y && \

docker/Dockerfile.eNB.ubuntu22

@@ -25,13 +25,13 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS enb-base
+FROM ran-base:latest as enb-base
 
 FROM ran-build:latest AS enb-build
 
 
 #start from scratch for target executable
-FROM ubuntu:jammy AS oai-enb
+FROM ubuntu:jammy as oai-enb
 ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris

docker/Dockerfile.gNB.aerial.ubuntu22

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
@@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \
 
 
 #start from scratch for target executable
-FROM ubuntu:jammy AS oai-gnb-aerial
+FROM ubuntu:jammy as oai-gnb-aerial
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe
 

docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address

@@ -25,7 +25,7 @@
 #
 #---------------------------------------------------------------------
 
-FROM ran-base:latest AS ran-build
+FROM ran-base:latest as ran-build
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
@@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \
 
 
 #start from scratch for target executable
-FROM ubuntu:jammy AS oai-gnb-aerial
+FROM ubuntu:jammy as oai-gnb-aerial
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe