try to merge the encoder branch, but bug exist

LDPC cuda cn_Proc parts successfully work in the ldpctest

See merge request oai/openairinterface5g!3469

CMakeLists.txt

@@ -300,15 +300,14 @@ add_definitions(-DHAVE_NETINET_IN_H)
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")
 
-if (E2_AGENT)
-  set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
-  set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
-  message(STATUS "Selected E2AP version: ${E2AP_VERSION}")
+set(E2AP_VERSION "E2AP_V2" CACHE STRING "E2AP version")
+set_property(CACHE E2AP_VERSION PROPERTY STRINGS "E2AP_V1" "E2AP_V2" "E2AP_V3")
+message(STATUS "Selected E2AP_VERSION: ${E2AP_VERSION}")
+
+set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
+set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
+message(STATUS "Selected KPM Version: ${KPM_VERSION}")
 
-  set(KPM_VERSION "KPM_V2_03" CACHE STRING "The KPM SM version to use")
-  set_property(CACHE KPM_VERSION PROPERTY STRINGS "KPM_V2_03" "KPM_V3_00")
-  message(STATUS "Selected KPM version: ${KPM_VERSION}")
-endif()
 
 add_boolean_option(ENABLE_IMSCOPE OFF "Enable phy scope based on imgui" OFF)
 add_boolean_option(ENABLE_IMSCOPE_RECORD OFF "Enable recording IQ data for imscope" OFF)
@@ -607,11 +606,6 @@ include_directories("${OPENAIR_DIR}")
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils/T
                     ${CMAKE_CURRENT_BINARY_DIR}/common/utils/T)
 
-include_directories(${OPENAIR_DIR}/common/utils/barrier)
-include_directories(${OPENAIR_DIR}/common/utils/actor)
-include_directories(${OPENAIR_DIR}/common/utils/threadPool)
-
-
 # set the T_LIB name to T if the target exists, otherwise leave empty
 set(T_LIB $<TARGET_NAME_IF_EXISTS:T>)
 
@@ -720,11 +714,6 @@ add_library(NFAPI_LIB ${NFAPI_SRC})
 target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
 target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_WLS)
-else()
-  target_compile_definitions(NFAPI_LIB PRIVATE ENABLE_SOCKET)
-endif()
 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
 
@@ -738,9 +727,6 @@ add_library(NFAPI_PNF_LIB ${NFAPI_PNF_SRC})
 target_link_libraries(NFAPI_PNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 target_link_libraries(NFAPI_PNF_LIB PUBLIC nr_fapi_p7)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_PNF_LIB PRIVATE ENABLE_WLS)
-endif()
 include_directories(${NFAPI_DIR}/pnf/public_inc)
 include_directories(${NFAPI_DIR}/pnf/inc)
 
@@ -759,9 +745,6 @@ endif()
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)
 
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_WLS)
-endif()
 # nFAPI user defined code
 #############################
 set(NFAPI_USER_SRC
@@ -771,15 +754,11 @@ set(NFAPI_USER_SRC
   ${NFAPI_USER_DIR}/gnb_ind_vars.c
 )
 add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})
-if(OAI_WLS)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_WLS)
-elseif (OAI_AERIAL)
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
-else()
-  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_SOCKET)
-endif()
 target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)
 target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)
+if(OAI_AERIAL)
+  target_compile_definitions(NFAPI_USER_LIB PRIVATE ENABLE_AERIAL)
+endif()
 include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
@@ -1067,7 +1046,7 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)
+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)
@@ -1168,6 +1147,7 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
   ${NR_RRC_DIR}/mac_rrc_dl_f1ap.c
+  ${NR_RRC_DIR}/nr_rrc_config.c
   ${NR_RRC_DIR}/rrc_gNB_nsa.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_NGAP.c
@@ -1250,7 +1230,6 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
   ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
-  ${NR_GNB_MAC_DIR}/nr_radio_config.c
  )
 
 
@@ -1786,6 +1765,9 @@ target_link_libraries(oairu PRIVATE
   SCHED_RU_LIB PHY_COMMON PHY_RU UTIL shlib_loader
   -Wl,--end-group z dl)
 
+target_link_libraries(oairu PRIVATE pthread m CONFIG_LIB rt ${T_LIB})
+target_link_libraries(oairu PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 # force the generation of ASN.1 so that we don't need to wait during the build
 target_link_libraries(lte-softmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
@@ -1824,30 +1806,6 @@ target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIE
 target_link_libraries(lte-uesoftmodem PRIVATE
                       asn1_lte_rrc asn1_s1ap asn1_m2ap asn1_m3ap asn1_x2ap)
 
-# nr RRU
-add_executable(oainr_ru
-  ${OPENAIR_DIR}/executables/nr-ru.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
-  ${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
-  ${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
-  ${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
-  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
-  ${OPENAIR_DIR}/radio/COMMON/record_player.c
-  ${OPENAIR_DIR}/executables/softmodem-common.c
-  ${OPENAIR_DIR}/executables/main_nr_ru.c
-)
-target_link_libraries(oainr_ru PRIVATE
-  -Wl,--start-group
-  UTIL SCHED_RU_LIB PHY_COMMON PHY_RU shlib_loader
-  -Wl,--end-group z dl)
-target_link_libraries(oainr_ru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
-  barrier actor)
-target_link_libraries(oainr_ru PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_phy_common time_management)
-target_link_libraries(oainr_ru PUBLIC MAC_NR_COMMON)
-
 # nr-softmodem
 ###################################################
 
@@ -1880,12 +1838,6 @@ target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-add_boolean_option(OAI_WLS OFF "Activate OAI's WLS driver" OFF)
-if (OAI_WLS)
-    target_link_libraries(nr-softmodem PUBLIC wls_integration_lib)
-else()
-    target_link_libraries(nr-softmodem PUBLIC nfapi_socket_lib)
-endif()
 add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
 if (OAI_AERIAL)
   target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)

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

@@ -8,13 +8,13 @@
 #define DL_ARFCN 631296
 #define TDD 1
 
-log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
 log_filename: "/tmp/ue.log",
 
 /* Enable remote API and Web interface */
 com_addr: "0.0.0.0:9002",
 
-include "rf_driver/config.cfg",
+include "rf_driver_20/1chan.cfg",
 
 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
@@ -22,6 +22,7 @@ allow dynamic UE creation from remote API */
   cell_groups: [{
       group_type: "nr",
       multi_ue: true,
+      ldpc_max_its:8,
       cells: [{
       rf_port: 0,
       bandwidth: 20,

ci-scripts/as_ue/config.cfg

@@ -1,47 +0,0 @@
-/* Parameters for SDR device version 2023-06-10
- * Copyright (C) 2015-2023 Amarisoft
- */
-
-#if !defined(N_CELL)
-  #define N_CELL 1
-#endif
-
-#if N_ANTENNA_DL <= 2
-  #define N_CHAN N_CELL
-#else
-  #define N_CHAN 2*N_CELL
-#endif
-
-rf_driver: {
-    name: "sdr",
-
-    /* list of devices. 'dev0' is always the master. */
-#if N_CHAN == 1
-    args: "dev0=/dev/sdr0",
-#elif N_CHAN == 2
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
-#elif N_CHAN == 3
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2",
-#elif N_CHAN == 4
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3",
-#elif N_CHAN == 6
-    args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2,dev3=/dev/sdr3,dev4=/dev/sdr4,dev5=/dev/sdr5",
-#else
-    args: "",
-#endif
-
-    /* synchronisation source: internal, gps, external (default = internal) */
-    // sync: "gps",
-    //rx_antenna:"rx", // force to use the RX connector in TDD as RX antenna
-
-    /* PCIe jitter. decrease it to reduce latency */
-    fifo_tx_time: 50,
-    //rx_latency: 30,
-},
-
-#if 0
-  tx_pad_duration:300,
-#endif
-
-tx_gain: 75.0, /* TX gain (in dB) */
-rx_gain: 55.0, /* RX gain (in dB) */

ci-scripts/ci_infra.yaml

@@ -65,9 +65,9 @@ oc-cn5g:
   Host: avra
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jun oaicicd-core-for-ci-ran %%log_dir%%"
+  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran"
+  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-ci-ran %%log_dir%%"
 
 oc-cn5g-20897:
   Host: cacofonix
@@ -89,8 +89,8 @@ matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
   RunIperf3Server: False
-  Deploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type start-basic"
-  Undeploy: "cd /opt/oai-cn5g-fed-v2-jun-2025/docker-compose && python3 ./core-network.py --type stop-basic"
+  Deploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type start-basic"
+  Undeploy: "cd /opt/oai-cn5g-fed-v2/docker-compose && python3 ./core-network.py --type stop-basic"
   LogCollect:
     - "docker logs oai-smf > %%log_dir%%/oai-smf.log"
     - "docker logs oai-amf > %%log_dir%%/oai-amf.log"
@@ -147,127 +147,125 @@ ltebox-nepes:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
+  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_2x2:
   Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.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-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  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/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":1}'
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
   CmdPrefix: ip netns exec ue1
   MTU: 1500
 amarisoft_ue_2:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":2}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":2}'
   NetworkScript: ip netns exec ue2 ip a show dev pdn0
   CmdPrefix: ip netns exec ue2
   MTU: 1500
 amarisoft_ue_3:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":3}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":3}'
   NetworkScript: ip netns exec ue3 ip a show dev pdn0
   CmdPrefix: ip netns exec ue3
   MTU: 1500
 amarisoft_ue_4:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":4}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":4}'
   NetworkScript: ip netns exec ue4 ip a show dev pdn0
   CmdPrefix: ip netns exec ue4
   MTU: 1500
 amarisoft_ue_5:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":5}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":5}'
   NetworkScript: ip netns exec ue5 ip a show dev pdn0
   CmdPrefix: ip netns exec ue5
   MTU: 1500
 amarisoft_ue_6:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":6}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":6}'
   NetworkScript: ip netns exec ue6 ip a show dev pdn0
   CmdPrefix: ip netns exec ue6
   MTU: 1500
 amarisoft_ue_7:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":7}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":7}'
   NetworkScript: ip netns exec ue7 ip a show dev pdn0
   CmdPrefix: ip netns exec ue7
   MTU: 1500
 amarisoft_ue_8:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":8}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":8}'
   NetworkScript: ip netns exec ue8 ip a show dev pdn0
   CmdPrefix: ip netns exec ue8
   MTU: 1500
 amarisoft_ue_9:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":9}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":9}'
   NetworkScript: ip netns exec ue9 ip a show dev pdn0
   CmdPrefix: ip netns exec ue9
   MTU: 1500
 amarisoft_ue_10:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":10}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":10}'
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
 amarisoft_ue_11:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":11}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":11}'
   NetworkScript: ip netns exec ue11 ip a show dev pdn0
   CmdPrefix: ip netns exec ue11
   MTU: 1500
 amarisoft_ue_12:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":12}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":12}'
   NetworkScript: ip netns exec ue12 ip a show dev pdn0
   CmdPrefix: ip netns exec ue12
   MTU: 1500
 amarisoft_ue_13:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":13}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":13}'
   NetworkScript: ip netns exec ue13 ip a show dev pdn0
   CmdPrefix: ip netns exec ue13
   MTU: 1500
 amarisoft_ue_14:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":14}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":14}'
   NetworkScript: ip netns exec ue14 ip a show dev pdn0
   CmdPrefix: ip netns exec ue14
   MTU: 1500
 amarisoft_ue_15:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":15}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":15}'
   NetworkScript: ip netns exec ue15 ip a show dev pdn0
   CmdPrefix: ip netns exec ue15
   MTU: 1500
 amarisoft_ue_16:
   Host: amariue
-  AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
-  DetachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
+  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":16}'
+  DetachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_off","ue_id":16}'
   NetworkScript: ip netns exec ue16 ip a show dev pdn0
   CmdPrefix: ip netns exec ue16
   MTU: 1500

ci-scripts/cls_containerize.py

@@ -152,6 +152,19 @@ def GetImageName(ssh, svcName, file):
 	else:
 		return ret.stdout.strip()
 
+def GetServiceHealth(ssh, svcName, file):
+	if svcName is None:
+		return False, f"Service {svcName} not found in {file}"
+	image = GetImageName(ssh, svcName, file)
+	if 'db_init' in svcName or 'db-init' in svcName: # exits with 0, there cannot be healthy
+		return True, f"Service {svcName} healthy, image {image}"
+	for _ in range(8):
+		result = ssh.run(f"docker compose -f {file} ps --format json {svcName}  | jq -r 'if type==\"array\" then .[0].Health else .Health end'", silent=True)
+		if result.stdout == 'healthy':
+			return True, f"Service {svcName} healthy, image {image}"
+		time.sleep(5)
+	return False, f"Failed to deploy: service {svcName}"
+
 def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
 	if ret.returncode != 0:
@@ -298,6 +311,7 @@ class Containerize():
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.deploymentTag = ''
+		self.eNB_logFile = ['', '', '']
 
 		self.testCase_id = ''
 
@@ -306,6 +320,17 @@ class Containerize():
 		self.dockerfileprefix = ''
 		self.host = ''
 
+		self.deployedContainers = []
+		self.tsharkStarted = False
+		self.pingContName = ''
+		self.pingOptions = ''
+		self.pingLossThreshold = ''
+		self.svrContName = ''
+		self.svrOptions = ''
+		self.cliContName = ''
+		self.cliOptions = ''
+
+		self.imageToCopy = ''
 		#checkers from xml
 		self.ran_checkers={}
 		self.num_attempts = 1
@@ -473,10 +498,10 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc.src.2025.05.20.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc.src.2025.05.20.tar.gz')
+				cmd.run('rm -f nvipc_src.*.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -687,7 +712,7 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --no-label-summary -j$(nproc)')
+		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
 		cmd.run(f'docker rmi ran-unittests:{baseTag}')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
@@ -847,24 +872,31 @@ class Containerize():
 			if num_attempts <= 0:
 				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
 			for attempt in range(num_attempts):
+				imagesInfo = []
+				healthInfo = []
 				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 60 -- {services}')
-				info = ssh.run(f"docker compose -f {wd_yaml} ps --all --format=\'table {{{{.Service}}}} [{{{{.Image}}}}] {{{{.Status}}}}\' -- {services} | column -t")
-				deployed = status.returncode == 0
-				if not deployed:
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d -- {services}')
+				if status.returncode != 0:
 					msg = f'cannot deploy services {services}: {status.stdout}'
 					logging.error(msg)
-				else:
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
+					return False
+				for svc in services.split():
+					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
+					logging.info(msg)
+					imagesInfo.append(msg)
+					healthInfo.append(health)
+				deployed = all(healthInfo)
+				if deployed:
 					break
-				if (attempt < num_attempts - 1):
-					warning_msg = (f'Failed to deploy on attempt {attempt}, restart services {services}')
+				elif (attempt < num_attempts - 1):
+					warning_msg = f'Restart services {services}'
 					logging.warning(warning_msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [warning_msg])
+					imagesInfo.append(warning_msg)
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', ['\n'.join(imagesInfo)])
 					for svc in services.split():
 						CopyinServiceLog(ssh, lSourcePath, yaml_dir, svc, wd_yaml, f'{svc}-{HTML.testCase_id}-attempt{attempt}.log')
 					ssh.run(f'docker compose -f {wd_yaml} down -- {services}')
-		imagesInfo = info.stdout.splitlines()[1:]
-		logging.debug(f'{info.stdout.splitlines()[1:]}')
 		if deployed:
 			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:

ci-scripts/cls_oai_html.py

@@ -224,6 +224,7 @@ class HTMLManagement():
 			self.htmlFile.write('  </table>\n')
 			self.htmlFile.write('  </div>\n')
 			self.htmlFile.close()
+			time.sleep(1)
 			if passStatus:
 				cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
 				subprocess.run(cmd, shell=True)

ci-scripts/cls_oaicitest.py

@@ -213,7 +213,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 			pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'
 		return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
 
-def Custom_Command(HTML, node, command):
+def Custom_Command(HTML, node, command, command_fail):
     logging.info(f"Executing custom command on {node}")
     cmd = cls_cmd.getConnection(node)
     ret = cmd.run(command)
@@ -221,20 +221,26 @@ def Custom_Command(HTML, node, command):
     logging.debug(f"Custom_Command: {command} on node: {node} - {'OK, command succeeded' if ret.returncode == 0 else f'Error, return code: {ret.returncode}'}")
     status = 'OK'
     message = []
-    if ret.returncode != 0:
+    if ret.returncode != 0 and not command_fail:
+        message = [ret.stdout]
+        logging.warning(f'Custom_Command output: {message}')
+        status = 'Warning'
+    if ret.returncode != 0 and command_fail:
         message = [ret.stdout]
         logging.error(f'Custom_Command failed: output: {message}')
         status = 'KO'
     HTML.CreateHtmlTestRowQueue(command, status, message)
     return status == 'OK' or status == 'Warning'
 
-def Custom_Script(HTML, node, script):
+def Custom_Script(HTML, node, script, command_fail):
 	logging.info(f"Executing custom script on {node}")
 	ret = cls_cmd.runScript(node, script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
-	if ret.returncode != 0:
+	if ret.returncode != 0 and not command_fail:
+		status = 'Warning'
+	if ret.returncode != 0 and command_fail:
 		status = 'KO'
 	HTML.CreateHtmlTestRowQueue(script, status, message)
 	return status == 'OK' or status == 'Warning'

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

@@ -58,14 +58,6 @@ gNBs =
   }
 );
 
-pdcp = {
-  drb = {
-    sn_size = "len18bits"
-    t_reordering  = "ms100"
-    discard_timer = "infinity"
-  }
-}
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

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

@@ -163,31 +163,6 @@ gNBs =
   }
 );
 
-rlc = {
-  srb = {
-    t_poll_retransmit = "ms45"
-    t_reassembly = "ms25"
-    t_status_prohibit = "ms0"
-    poll_pdu = "infinity"
-    poll_byte = "infinity"
-    max_retx_threshold = "t8"
-    sn_field_length = "size12"
-  }
-  drb_am = {
-    t_poll_retransmit = "ms45"
-    t_reassembly = "ms15"
-    t_status_prohibit = "ms15"
-    poll_pdu = "p64"
-    poll_byte = "kB500"
-    max_retx_threshold = "t32"
-    sn_field_length = "size18"
-  }
-  drb_um = {
-    t_reassembly = "ms15"
-    sn_field_length = "size12"
-  }
-}
-
 MACRLCs = (
   {
     num_cc           = 1;

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

@@ -43,12 +43,19 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
+      # this is 3300.24 + 134*12*30e3 = 3348.48 MHz (5G NR GSCN: 7741)
+      absoluteFrequencySSB                                          = 649920;
+      #652860; #should be 649920
+#647520;
+#647540;
+#649920;
+#650208;
+#647540;
       dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
+      # this is 3300.24 MHz
+      dl_absoluteFrequencyPointA                                    = 646724;
+#649104;
+#646724;
       #scs-SpecificCarrierList
         dl_offstToCarrier                                           = 0;
 # subcarrierSpacing

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

@@ -169,10 +169,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-      GNB_IPV4_ADDRESS_FOR_S1_MME    = "172.21.16.109";
-      GNB_IPV4_ADDRESS_FOR_S1U       = "172.21.16.109";
+      GNB_IPV4_ADDRESS_FOR_S1_MME    = "192.168.68.194";
+      GNB_IPV4_ADDRESS_FOR_S1U       = "192.168.68.194";
       GNB_PORT_FOR_S1U               = 2152; # Spec 2152
-      GNB_IPV4_ADDRESS_FOR_X2C       = "172.21.16.109";
+      GNB_IPV4_ADDRESS_FOR_X2C       = "192.168.68.194";
       GNB_PORT_FOR_X2C               = 36422; # Spec 36422
     };
 

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

@@ -149,8 +149,6 @@ gNBs =
 
   #ext2
     #ntn_Config_r17
-      # This can be of values {s5, s10, s15, s20, s25, s30, s35, s40, s45, s50, s55, s60, s120, s180, s240, s900}
-      ntn-UlSyncValidityDuration-r17                                = 240;
       cellSpecificKoffset_r17                                       = 478;
       ta-Common-r17                                                 = 58629666; # 238.74 ms
       positionX-r17                                                 = 0;
@@ -195,15 +193,6 @@ gNBs =
   }
 );
 
-rlc = {
-  srb = {
-    t_poll_retransmit = "ms2000"
-  }
-  drb_am = {
-    t_poll_retransmit = "ms2000"
-  }
-}
-
 MACRLCs = (
 {
   num_cc                      = 1;

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

@@ -21,6 +21,7 @@ gNBs =
 
     sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
+    beam_weights = [0]; // single SSB -> one analog beam
 
     servingCellConfigCommon = (
     {
@@ -178,7 +179,6 @@ MACRLCs = ({
   set_analog_beamforming      = 1;
   beam_duration               = 1;
   beams_per_period            = 1;
-  beam_weights = [0]; // single SSB -> one analog beam
 });
 
 L1s = (

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

@@ -213,7 +213,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -223,7 +223,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

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

@@ -212,7 +212,7 @@ security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen
   # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea2", "nea0" );
+  ciphering_algorithms = ( "nea0" );
 
   # preferred integrity algorithms
   # the first one of the list that an UE supports in chosen
@@ -222,7 +222,7 @@ security = {
   # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
   # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
   drb_ciphering = "yes";
-  drb_integrity = "yes";
+  drb_integrity = "no";
 };
 
 log_config :

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

@@ -185,7 +185,6 @@ L1s = (
   num_cc                = 1;
   tr_n_preference       = "local_mac";
   prach_dtx_threshold   = 120;
-  tx_amp_backoff_dB = 30;
 }
 );
 

ci-scripts/datalog_rt_stats.100.2x2.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 17.0
   UL Indication : 1.0
   Slot Indication : 13.0
-  feprx : 151.0
-  feptx_ofdm (per port, half_slot) : 57
-  feptx_total : 148
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.25
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/datalog_rt_stats.1x1.60.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 5.0
   UL Indication : 1.0
   Slot Indication : 6.0
-  feprx : 44.0
-  feptx_ofdm (per port, half_slot) : 31
-  feptx_total : 58
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/datalog_rt_stats.60.2x2.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 8.0
   UL Indication : 3.0
   Slot Indication : 9.0
-  feprx : 85.0
-  feptx_ofdm (per port, half_slot) : 31
-  feptx_total : 92
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.35
   UL Indication : 1.00
   Slot Indication : 0.35
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/datalog_rt_stats.default.yaml

@@ -19,9 +19,6 @@ Ref :
   DL & UL scheduling timing : 4.0
   UL Indication : 2.0
   Slot Indication : 5.0
-  feprx : 43.0
-  feptx_ofdm (per port, half_slot) : 30
-  feptx_total : 57
 DeviationThreshold :
   feprx : 0.25
   feptx_prec : 0.25
@@ -35,6 +32,3 @@ DeviationThreshold :
   DL & UL scheduling timing : 0.50
   UL Indication : 1.00
   Slot Indication : 0.50
-  feprx : 0.25
-  feptx_ofdm (per port, half_slot) : 0.25
-  feptx_total : 0.25

ci-scripts/main.py

@@ -376,12 +376,14 @@ def ExecuteActionWithParam(action):
 			# Change all execution targets to localhost
 			node = 'localhost'
 		command = test.findtext('command')
-		success = cls_oaicitest.Custom_Command(HTML, node, command)
+		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
+		success = cls_oaicitest.Custom_Command(HTML, node, command, command_fail)
 
 	elif action == 'Custom_Script':
 		node = test.findtext('node')
 		script = test.findtext('script')
-		success = cls_oaicitest.Custom_Script(HTML, node, script)
+		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
+		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -624,7 +626,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			HTML.testCase_id=CiTestObj.testCase_id
 			CiTestObj.desc = test.findtext('desc')
 			always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
-			may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
 			HTML.desc=CiTestObj.desc
 			action = test.findtext('class')
 			if (CheckClassValidity(xml_class_list, action, id) == False):
@@ -638,9 +639,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				break
 			try:
 				test_succeeded = ExecuteActionWithParam(action)
-				if not test_succeeded and may_fail:
-					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
-				elif not test_succeeded:
+				if not test_succeeded:
 					logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests")
 					task_set_succeeded = False
 			except Exception as e:

ci-scripts/ran.py

@@ -95,6 +95,7 @@ class RANManagement():
 		self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
 		self.node = ''
 		self.command = ''
+		self.command_fail = False
 
 
 #-----------------------------------------------------------

ci-scripts/tests/test-runner/test.xml

@@ -27,8 +27,6 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  000001
- 000011
- 000012
  000002
  000003
  000004
@@ -40,21 +38,7 @@
                 <desc>This should succeed</desc>
                 <node>localhost</node>
                 <command>true</command>
-        </testCase>
-
-        <testCase id="000011">
-                <class>Custom_Command</class>
-                <desc>This may fail</desc>
-                <may_fail>true</may_fail>
-                <node>localhost</node>
-                <command>false</command>
-        </testCase>
-
-        <testCase id="000012">
-                <class>Custom_Command</class>
-                <desc>This is still executed</desc>
-                <node>localhost</node>
-                <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000002">
@@ -62,6 +46,7 @@
                 <desc>This should fail</desc>
                 <node>localhost</node>
                 <command>false</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000003">
@@ -69,6 +54,7 @@
                 <desc>This should be skipped</desc>
                 <node>localhost</node>
                 <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000004">
@@ -77,5 +63,6 @@
                 <always_exec>true</always_exec>
                 <node>localhost</node>
                 <command>true</command>
+                <command_fail>yes</command_fail>
         </testCase>
 </testCaseList>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -80,16 +80,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <nodes>acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -93,7 +93,7 @@
         <testCase id="000030">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>15</idle_sleep_time_in_sec>
+                <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
         </testCase>
 
         <testCase id="000031">
@@ -106,7 +106,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="000024">
@@ -122,9 +122,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -132,8 +132,9 @@
         <testCase id="030020">
                 <class>Custom_Command</class>
                 <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="030021">
@@ -141,9 +142,9 @@
                 <desc>Iperf (DL/5Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 5M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -153,9 +154,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -163,17 +164,18 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <node>cacofonix</node>
+                <command>echo ci force_reestab | nc 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="020022">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.5 -w25</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -181,57 +183,65 @@
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <node>cacofonix</node>
+                <command>echo ci get_reestab_count | nc 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040021">
                 <class>Custom_Command</class>
                 <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040022">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+                <node>cacofonix</node>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040023">
                 <class>Custom_Command</class>
                 <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>acamas</node>
-                <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
+                <node>cacofonix</node>
+                <command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040024">
                 <class>Custom_Command</class>
                 <desc>Get UE sync state (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
+                <node>cacofonix</node>
+                <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040025">
                 <class>Custom_Command</class>
                 <desc>Trigger Handover</desc>
-                <node>acamas</node>
-                <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
+                <node>cacofonix</node>
+                <command>echo ci trigger_f1_ho | nc 192.168.71.150 9090</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040026">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>acamas</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+                <node>cacofonix</node>
+                <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3584"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040027">
                 <class>Custom_Command</class>
                 <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>acamas</node>
-                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+                <node>cacofonix</node>
+                <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3585"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100021">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020011">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -103,9 +103,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 30</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_flexric_rfsim.xml

@@ -32,6 +32,7 @@
  000001
  000002
  000003
+ 002001
  010000
  000004
  333333
@@ -39,6 +40,7 @@
  010002
  010003
  020005
+ 010013
  002006
  444444
  100002
@@ -48,6 +50,12 @@
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
 
+        <testCase id="002001">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+        </testCase>
+
         <testCase id="111110">
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
@@ -165,39 +173,43 @@
         </testCase>
 
         <testCase id="010000">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>RC monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/rc-moni-010000.log</command>
         </testCase>
 
         <testCase id="010001">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>KPM monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm-moni-010001.log</command>
         </testCase>
 
         <testCase id="010002">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>KPM monitoring and RC control</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm_rc-010002.log</command>
         </testCase>
 
         <testCase id="010003">
-                <class>Deploy_Object</class>
+                <class>Custom_Command</class>
                 <desc>Custom SMs monitoring</desc>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-                <eNB_instance>0</eNB_instance>
-                <eNB_serverId>0</eNB_serverId>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010003.log</command>
+        </testCase>
+
+        <testCase id="010013">
+                <class>Custom_Command</class>
+                <desc>Custom SMs monitoring</desc>
+                <node>localhost</node>
+                <command_fail>yes</command_fail>
+                <command>docker exec oai-flexric bash -c "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/sms-moni-010013.log</command>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -133,16 +133,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -151,9 +151,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -162,9 +162,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
                 <id>rfsim5g_ue2</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -173,9 +173,9 @@
                 <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -184,9 +184,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from both UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -195,9 +195,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from all UEs</desc>
                 <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -207,9 +207,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -219,9 +219,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -230,21 +230,21 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444444">
                 <class>Detach_UE</class>
                 <desc>Detach OAI UE 1 and 2</desc>
                 <id>rfsim5g_ue rfsim5g_ue2</id>
-                <nodes>acamas acamas</nodes>
+                <nodes>cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="444445">
                 <class>Detach_UE</class>
-                <desc>Detach OAI UE 3 to 10</desc>
+                <desc>Detach OAI UE 2 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
+                <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -91,7 +91,7 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="000004">
@@ -104,9 +104,9 @@
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args> -c 20 -i0.5</ping_args>
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -127,9 +127,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -139,9 +139,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -149,15 +149,17 @@
         <testCase id="040001">
                 <class>Custom_Command</class>
                 <desc>Force Msg3 C-RNTI RA</desc>
-                <node>acamas</node>
-                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
+                <node>cacofonix</node>
+                <command>echo ciUE force_crnti_ra | nc 192.168.71.150 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>acamas</node>
-                <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
+                <node>cacofonix</node>
+                <command>echo ciUE force_RRC_IDLE | nc 192.168.71.150 8091</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -103,21 +103,21 @@
                 <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
 
         <testCase id="030002">
                 <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
-                <iperf_args>-u -b 3M -t 20</iperf_args>
+                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 4M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -49,7 +49,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -80,9 +80,9 @@
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -103,9 +103,9 @@
                 <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -29,7 +29,6 @@
  800813
  000000
  000001
- 000013
  020001
  020002
  100001
@@ -69,20 +68,13 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-        </testCase>
-
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +83,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -33,11 +33,6 @@
  000003
  020001
  020002
- 040001
- 020022
- 040002
- 020001
- 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -78,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -96,40 +91,13 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
-        <testCase id="040001">
-                <class>Custom_Command</class>
-                <desc>Trigger Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
-        <testCase id="020022">
-                <class>Ping</class>
-                <desc>Ping ext-dn from NR-UE</desc>
-                <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
-                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
-                <ping_args>-c 20 -i0.5 -w25</ping_args>
-                <ping_packetloss_threshold>80</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="040002">
-                <class>Custom_Command</class>
-                <desc>Verify Reestablishment</desc>
-                <node>acamas</node>
-                <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-                <command_fail>yes</command_fail>
-        </testCase>
-
         <testCase id="100001">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -77,8 +77,9 @@
         <testCase id="000005">
                 <class>Custom_Command</class>
                 <desc>Check that UE synched</desc>
-                <node>acamas</node>
+                <node>cacofonix</node>
                 <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
+                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="100001">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -30,7 +30,6 @@
  004000
  000000
  000001
- 000030		
  020001
  020002
  100001
@@ -49,7 +48,7 @@
         <testCase id="004000">
             <class>Custom_Command</class>
             <desc>Clean-Up any residual volume</desc>
-            <node>acamas</node>
+            <node>cacofonix</node>
             <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
         </testCase>
         <testCase id="800813">
@@ -76,19 +75,13 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
-        <testCase id="000030">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-        </testCase>
-
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -97,9 +90,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
                 <id>rfsim5g_gnb_nos1</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c20 -i0.2</ping_args>
                 <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
@@ -115,6 +108,14 @@
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
 
+        <testCase id="004000">
+                <class>Custom_Command</class>
+                <always_exec>true</always_exec>
+                <desc>Clean-Up any residual volume</desc>
+                <node>cacofonix</node>
+                <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
+        </testCase>
+
         <testCase id="222222">
                 <class>Clean_Test_Server_Images</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -73,16 +73,16 @@
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
         </testCase>
 
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -91,9 +91,9 @@
                 <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
                 <id>rfsim5g_ext_dn</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <ping_args>-c 20 -i 0.25</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -103,9 +103,9 @@
                 <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>
@@ -115,9 +115,9 @@
                 <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                 <iperf_args>-u -b 1M -t 20</iperf_args>
                 <id>rfsim5g_ue</id>
-                <nodes>acamas</nodes>
+                <nodes>cacofonix</nodes>
                 <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>acamas</svr_node>
+                <svr_node>cacofonix</svr_node>
                 <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
         </testCase>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -70,9 +70,9 @@
 
 	<testCase id = "100000">
 		<class>Custom_Command</class>
-		<desc>Reset USRP on nepes</desc>
+		<desc>Reset USRP</desc>
 		<node>nepes</node>
-		<command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
+		<command>sudo -S /usr/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
 	</testCase>
 
 	<testCase id="200000">

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -35,8 +35,6 @@
                 000011
                 000022
                 000033
-                200022
-                300033
                 000222
                 222222
                 333333
@@ -117,28 +115,6 @@
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
         </testCase>
 
-       <testCase id="200022">
-                <class>Iperf</class>
-                <desc>Optional iperf (DL/UDP/1000M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 1000M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="300033">
-                <class>Iperf</class>
-                <desc>Optional iperf (UL/UDP/90M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 90M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
         <testCase id="000222">
                 <class>Detach_UE</class>
                 <always_exec>true</always_exec>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -182,7 +182,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/3Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/3Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 45M -t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -193,7 +193,7 @@
 
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_tcp_rate_target>2</iperf_tcp_rate_target>
@@ -202,7 +202,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/1Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/1Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 15M -t 30</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -213,7 +213,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <svr_id>oc-cn5g</svr_id>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>

ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml

@@ -179,7 +179,7 @@
 
   <testCase id="000010">
     <class>Iperf</class>
-    <desc>iperf (DL/4Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/4Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 60M -t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -190,7 +190,7 @@
 
   <testCase id="000030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_tcp_rate_target>3.9</iperf_tcp_rate_target>
@@ -199,7 +199,7 @@
 
   <testCase id="000020">
     <class>Iperf</class>
-    <desc>iperf (UL/1.5Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/1.5Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 22.5M -t 30</iperf_args>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -210,7 +210,7 @@
 
   <testCase id="000040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <svr_id>oc-cn5g</svr_id>
     <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>

ci-scripts/xml_files/container_sa_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

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

ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml

@@ -49,6 +49,7 @@
     <desc>Setup sriov and network interfaces Metanoia</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="110000">
@@ -91,7 +92,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/570Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/570Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 570M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -102,7 +103,7 @@
 
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <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>80</iperf_tcp_rate_target>
@@ -111,7 +112,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 100M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -122,7 +123,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -165,6 +166,7 @@
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -36,7 +36,6 @@
     100020
     100030
     100040
-    100011
     103000
     100002
     130000
@@ -50,6 +49,7 @@
     <desc>Setup sriov and network interfaces VVDN</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
   <testCase id="110000">
@@ -90,7 +90,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/600Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (DL/600Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 600M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -99,20 +99,9 @@
     <svr_id>oc-cn5g-20897</svr_id>
   </testCase>
 
-  <testCase id="100011">
-    <class>Iperf</class>
-    <desc>Optional iperf (DL/700Mbps/UDP)(30 sec)</desc>
-    <may_fail>true</may_fail>
-    <iperf_args>-u -b 700M -t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
+    <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>
@@ -121,7 +110,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/80Mbps/UDP)(30 sec)</desc>
+    <desc>iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-u -b 80M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -132,7 +121,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
@@ -175,6 +164,7 @@
     <desc>Set CPU to idle state, set kernel parameters to default values</desc>
     <node>cacofonix</node>
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
+    <command_fail>yes</command_fail>
   </testCase>
 
 

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

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

ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml

@@ -10,7 +10,7 @@ services:
             CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
         healthcheck:
             test: /bin/bash -c "nodetool status"
-            interval: 20s
+            interval: 10s
             timeout: 5s
             retries: 5
 

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,16 +61,13 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
 
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -85,8 +78,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -96,8 +87,6 @@ services:
         container_name: rfsim5g-oai-cu
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment: 
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
                                     --rfsimulator.options chanmod
@@ -114,8 +103,6 @@ services:
           - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -125,8 +112,6 @@ services:
         container_name: rfsim5g-oai-du-pci0
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
@@ -145,8 +130,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -156,8 +139,6 @@ services:
         container_name: rfsim5g-oai-du-pci1
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
@@ -180,8 +161,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -194,13 +173,13 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
                                     --rfsimulator.options chanmod
                                     --rfsimulator.serveraddr server
+                                    --rfsimulator.hanging-workaround 1
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
                                     --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
                                     --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1
@@ -214,8 +193,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -16,8 +15,6 @@ services:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
             interval: 10s
             timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
             retries: 30
         networks:
             public_net:
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -87,8 +80,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-            start_period: 10s
-            start_interval: 500ms
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
@@ -108,8 +99,6 @@ services:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
             timeout: 5s
-            start_period: 10s
-            start_interval: 500ms
             retries: 5
         ipc: host
     oai-nr-ue:
@@ -137,8 +126,6 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-            start_period: 10s
-            start_interval: 500ms
         ipc: host
 
 networks:

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

@@ -67,18 +67,6 @@ All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_r
 For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.
 For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the `../5g_rfsimulator_e1` folder.
 
-Note: **These instructions require `docker compose` v2.36.0 or later** due to the
-use of the `interface_name` property, which is necessary for ensuring consistent
-IP address assignment to the container interface.
-
-If you're using an older version of `docker compose`, you may encounter the following
-error:
-```
-validating docker-compose.yaml: services.oai-upf.networks.public_net Additional property interface_name is not allowed
-```
-To update to the required version, you can follow the official Docker documentation:
-https://docs.docker.com/compose/install/linux/
-
 ## 2.1. Deploy OAI 5G Core Network ##
 
 ```bash
@@ -558,7 +546,8 @@ section in the file for details. This includes an image build service as well as
 code compilation service. This is necessary as the executable has to be linked
 against the same libraries that are present in the executing image. This might
 take a while the first time but other that that is very fast. Here is a list of
-commands (wait between each command). Tested with `docker compose` v2.36.2.
+commands (wait between each command). Tested with `docker compose` v2.27.0
+
 
 This command deploys OAI 5G Core Network
 ```bash

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,16 +77,12 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
-        cap_add:
-            - SYS_NICE
         cap_drop:
             - ALL
         environment:
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.106prb.rfsim.yaml:/opt/oai-gnb/etc/gnb.yaml
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -121,7 +108,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -135,8 +121,6 @@ services:
             - ../../conf_files/nrue.uicc.yaml:/opt/oai-nr-ue/etc/nr-ue.yaml
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -148,7 +132,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -162,8 +145,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -175,7 +156,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -189,8 +169,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -202,7 +180,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -216,8 +193,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -229,7 +204,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -243,8 +217,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -256,7 +228,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -270,8 +241,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -283,7 +252,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -297,8 +265,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -310,7 +276,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -324,8 +289,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -337,7 +300,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -351,8 +313,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -364,7 +324,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -378,8 +337,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -106,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.24prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +124,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -94,8 +85,6 @@ services:
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
-        cap_add:
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -122,7 +109,6 @@ services:
         cap_add:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
-            - SYS_NICE
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
@@ -137,8 +123,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,10 +61,8 @@ services:
         networks:
             core_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
 
     oai-cucp:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
@@ -93,8 +87,6 @@ services:
             - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -124,8 +116,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -158,8 +148,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -192,8 +180,6 @@ services:
             - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-cuup"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -223,8 +209,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -257,8 +241,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -291,8 +273,6 @@ services:
             - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -321,8 +301,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -351,8 +329,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -382,8 +358,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

ci-scripts/yaml_files/5g_rfsimulator_flexric/conf/flexric.conf

@@ -1,5 +1,5 @@
 [NEAR-RIC]
 NEAR_RIC_IP = 192.168.70.150
-
 [XAPP]
-DB_DIR = /tmp/
+DB_PATH = /flexric/db/
+DB_NAME = xapp_rnis_db

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

@@ -7,79 +7,12 @@ services:
                 ipv4_address: 192.168.70.150
         volumes:
             - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
+            - sharedXappLibs:/usr/local/lib/flexric/
         healthcheck:
             test: /bin/bash -c "pgrep nearRT-RIC"
             interval: 10s
             timeout: 5s
 
-    xapp-rc-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni"
-        container_name: xapp-rc-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.154
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_rc_moni"
-            interval: 10s
-            timeout: 5s
-
-    xapp-kpm-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni"
-        container_name: xapp-kpm-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.155
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_kpm_moni"
-            interval: 10s
-            timeout: 5s
-
-    xapp-kpm-rc:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc"
-        container_name: xapp-kpm-rc
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.156
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep xapp_kpm_rc"
-            interval: 10s
-            timeout: 5s
-
-    xapp-gtp-mac-rlc-pdcp-moni:
-        image: ${REGISTRY:-oaisoftwarealliance}/oai-flexric:${FLEXRIC_TAG:-develop}
-        command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni"
-        container_name: xapp-gtp-mac-rlc-pdcp-moni
-        depends_on:
-            - oai-flexric
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.70.157
-        volumes:
-            - ./conf/flexric.conf:/usr/local/etc/flexric/flexric.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep -f xapp_gtp_mac_rlc_pdcp_moni"
-            interval: 10s
-            timeout: 5s
-
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         privileged: true
@@ -94,6 +27,7 @@ services:
                 ipv4_address: 192.168.70.151
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf:/opt/oai-gnb/etc/gnb.conf
+            - sharedXappLibs:/usr/local/lib/flexric/
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s
@@ -138,6 +72,9 @@ services:
             timeout: 5s
             retries: 5
 
+volumes:
+    sharedXappLibs:
+
 networks:
     public_net:
         name: oai-cn5g-public-net

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -105,8 +96,6 @@ services:
             - ../../conf_files/gnb.sa.band261.u3.32prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +124,6 @@ services:
                 ipv4_address: 192.168.71.150
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -96,9 +87,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
-                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.140
-                                    --telnetsrv.shrmod ci
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -108,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -135,8 +122,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -13,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -63,10 +61,8 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
@@ -81,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -103,8 +97,6 @@ services:
             - ../../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -137,8 +129,6 @@ services:
             - ../../conf_files/nrue.uicc.ntn-leo.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -18,8 +18,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -45,8 +43,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -60,3 +56,11 @@ networks:
                 - subnet: 192.168.71.128/26
         driver_opts:
             com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"

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

@@ -2,7 +2,6 @@ services:
     mysql:
         container_name: "rfsim5g-mysql"
         image: mysql:8.0
-        init: true
         volumes:
             - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
             - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
@@ -14,8 +13,6 @@ services:
             - MYSQL_ROOT_PASSWORD=linux
         healthcheck:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 30
@@ -49,7 +46,6 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
-        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -65,15 +61,12 @@ services:
         networks:
             public_net:
                 ipv4_address: 192.168.71.134
-                interface_name: eth0
             traffic_net:
                 ipv4_address: 192.168.72.134
-                interface_name: eth1
     oai-ext-dn:
         privileged: true
         container_name: rfsim5g-oai-ext-dn
         image: oaisoftwarealliance/trf-gen-cn5g:focal
-        init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
@@ -84,8 +77,6 @@ services:
                 ipv4_address: 192.168.72.135
         healthcheck:
             test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -108,8 +99,6 @@ services:
             - ../../conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -132,8 +121,6 @@ services:
             - ../../conf_files/gnb-pnf.band66.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5
@@ -159,8 +146,6 @@ services:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
             interval: 10s
             timeout: 5s
             retries: 5

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

@@ -14,9 +14,7 @@ services:
         volumes:
           - ../../conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
-            test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-            start_period: 15s
-            start_interval: 500ms
-            interval: 5s
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
             timeout: 5s
             retries: 5

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

@@ -14,9 +14,7 @@ services:
         volumes:
             - ../../conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
-            test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-            start_period: 15s
-            start_interval: 500ms
-            interval: 5s
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
             timeout: 5s
             retries: 5

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

@@ -16,7 +16,7 @@ services:
             - ../../conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 5s
+            interval: 15s
             timeout: 5s
             retries: 5
     oai-pnf:
@@ -35,9 +35,7 @@ services:
         volumes:
             - ../../conf_files/gnb-pnf.band77.usrpn310.4x4.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
-            test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-            start_period: 15s
-            start_interval: 500ms
-            interval: 5s
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 15s
             timeout: 5s
             retries: 5

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

@@ -16,9 +16,7 @@ services:
         volumes:
             - ../../conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
-            test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-            start_period: 15s
-            start_interval: 500ms
-            interval: 5s
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
             timeout: 5s
-            retries: 10
+            retries: 5

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

@@ -9,7 +9,6 @@ services:
             - IPC_LOCK
         ulimits:
           core: -1 # for core dumps
-        network_mode: "host"
         environment:
             USE_B2XX: 'yes'
             USE_ADDITIONAL_OPTIONS: --nsa -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
@@ -17,6 +16,9 @@ services:
             - /dev/bus/usb/:/dev/bus/usb/
         volumes:
             - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -24,3 +26,12 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+
+networks:
+    public_net:
+        name: nsa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "nsa-gnb-net"

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

@@ -22,12 +22,10 @@ services:
             oai-net:
                 ipv4_address: 172.21.18.20
         healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 15s
-           start_interval: 500ms
-           interval: 5s
+           test: /bin/bash -c "pgrep nr-softmodem"
+           interval: 10s
            timeout: 5s
-           retries: 10
+           retries: 5
 networks:
     oai-net:
         driver: macvlan

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

@@ -21,12 +21,10 @@ services:
             oai-net:
                 ipv4_address: 172.21.18.20
         healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 15s
-           start_interval: 500ms
-           interval: 5s
+           test: /bin/bash -c "pgrep nr-softmodem"
+           interval: 10s
            timeout: 5s
-           retries: 10
+           retries: 5
 networks:
     oai-net:
         driver: macvlan

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

@@ -21,13 +21,10 @@ services:
             oai-net:
                 ipv4_address: 172.21.18.20
         healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 15s
-           start_interval: 500ms
-           interval: 5s
+           test: /bin/bash -c "pgrep nr-softmodem"
+           interval: 10s
            timeout: 5s
-           retries: 10
-
+           retries: 5
 networks:
     oai-net:
         driver: macvlan

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

@@ -23,7 +23,7 @@ services:
       - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-1
+    image: cubb-build:24-3
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
     command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -33,7 +33,7 @@ services:
       timeout: 5s
       retries: 5
   oai-gnb-aerial:
-    cpuset: "13-14"
+    cpuset: "13-20"
     image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aerial:${TAG:-develop}
     depends_on:
       nv-cubb:

cmake_targets/build_oai

@@ -87,8 +87,6 @@ Options:
   Makes the NR softmodem
 --RU
   Makes the OAI RRU
---nrRU
-  Makes the OAI nrRRU
 --UE
    Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
@@ -101,7 +99,7 @@ Options:
    USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
-   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g, oran_fhlib_5g_mplane, WLS
+   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g, oran_fhlib_5g_mplane
 -P | --phy_simulators
    Makes the unitary tests Layer 1 simulators
 -s | --check
@@ -244,11 +242,6 @@ function main() {
             TARGET_LIST="$TARGET_LIST oairu"
             echo_info "Will compile RRU"
             shift;;
-       --nrRU)
-            nrRU=1
-            TARGET_LIST="$TARGET_LIST oainr_ru"
-            echo_info "Will compile nrRRU"
-            shift;;
        --UE)
             UE=1
             TARGET_LIST="$TARGET_LIST lte-uesoftmodem"
@@ -315,9 +308,6 @@ function main() {
                 TARGET_LIST="$TARGET_LIST $2"
                 CMAKE_CMD="$CMAKE_CMD -DOAI_FHI72=ON -DOAI_FHI72_MPLANE=ON"
                 ;;
-              "WLS"|"Wls"|"wls")
-                  CMAKE_CMD="$CMAKE_CMD -DOAI_WLS=ON"
-                  ;;
               "None")
                 ;;
               *)
@@ -499,7 +489,7 @@ function main() {
   if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
     # add some default libraries that should always be built
     # for eNB, gNB, UEs, simulators
-    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ||  $nrRU == 1 ]]; then
+    if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then
       TARGET_LIST="$TARGET_LIST params_libconfig coding rfsimulator dfts params_yaml vrtsim"
     fi
 

cmake_targets/tools/MODULES/Findxran.cmake

@@ -126,9 +126,12 @@ find_package_handle_standard_args(xran
   VERSION_VAR xran_VERSION
 )
 
+# in proper usage of cmake, include directory should only contain "api", but not header files under "src" directory;
+# however, we use xran_dev_get_ctx() and xran_dev_get_ctx_by_id() functions which are defined in xran_common.h;
+# since xran_common.h is under "src" directory, we have to include it in ${xran_INCLUDE_DIRS}
 if(xran_FOUND)
   set(xran_LIBRARIES ${xran_LIBRARY})
-  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})
+  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR} ${xran_INCLUDE_DIR}/../src)
 endif()
 
 if(xran_FOUND AND NOT TARGET xran::xran)

cmake_targets/tools/install_wls_lib.patch

@@ -1,209 +0,0 @@
-diff --git a/wls_lib/Makefile b/wls_lib/Makefile
-index 2f8e4b2..e657488 100644
---- a/wls_lib/Makefile
-+++ b/wls_lib/Makefile
-@@ -1,20 +1,6 @@
--###############################################################################
--#
--#   Copyright (c) 2021 Intel.
--#
--#   Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
--#
--#   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.
--#
--###############################################################################
-+################################################################
-+# <COPYRIGHT_TAG>
-+################################################################
- 
- MYCUSTOMTAB='     '
- MYCUSTOMSPACE='============================================================================================'
-@@ -24,11 +10,17 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
- #  Tools configuration
- ##############################################################
- ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
--CC  := icc
-+    CC  := icc
-     CPP := icpc
--AS := as
--AR := ar
--LD := icc
-+    AS := as
-+    AR := ar
-+    LD := icc
-+else ifeq ($(WIRELESS_SDK_TOOLCHAIN),gcc)
-+    CC  := gcc
-+    CPP := g++
-+    AS := as
-+    AR := ar
-+    LD := gcc
- else ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
-     CC  := icx
-     CPP := icx
-@@ -44,9 +36,9 @@ ifeq ($(WIRELESS_SDK_TARGET_ISA),sse)
- else ifeq ($(WIRELESS_SDK_TARGET_ISA),avx2)
-     TARGET_PROCESSOR := -xCORE-AVX2
- else ifeq ($(WIRELESS_SDK_TARGET_ISA),avx512)
--    TARGET_PROCESSOR := -xCORE-AVX512
-+    TARGET_PROCESSOR := -march=skylake-avx512
- else ifeq ($(WIRELESS_SDK_TARGET_ISA),snc)
--    TARGET_PROCESSOR := -xicelake-server
-+    TARGET_PROCESSOR := -march=icelake-server
- else ifeq ($(WIRELESS_SDK_TARGET_ISA),spr)
-     TARGET_PROCESSOR := -march=sapphirerapids
- endif
-@@ -66,15 +58,38 @@ PROJECT_DIR  := ./
- BUILDDIR := make
- PROJECT_BINARY := $(PROJECT_NAME).so
- 
-+PKGCONF ?= pkg-config
-+LIBDPDK_VERSION=20.11.3
-+
-+ifeq ($(shell $(PKGCONF) --modversion "libdpdk = '$(LIBDPDK_VERSION)'"),$(LIBDPDK_VERSION))
-+    DPDK_INSTALLED=1
-+else
-+    DPDK_INSTALLED=0
-+endif
-+
- ifeq ($(RTE_SDK),)
--$(error "Please define RTE_SDK environment variable")
-+ifeq ($(DPDK_INSTALLED),0)
-+$(error "Please define RTE_SDK environment variable OR install DPDK version $(LIBDPDK_VERSION)")
-+endif
- endif
- 
--RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
-+# At least one of the options is defined
-+
-+ifneq ($(RTE_SDK),)
-+    RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
-+else ifeq ($(DPDK_INSTALLED),1)
-+    RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig  $(PKGCONF) --cflags-only-I libdpdk)
-+endif
- 
- CC_SRC = wls_lib_dpdk.c \
- 	syslib.c
- 
-+CC_HDR = syslib.h \
-+	ttypes.h \
-+	wls.h \
-+	wls_debug.h \
-+	wls_lib.h
-+
- CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
- 	-fdata-sections \
- 	-ffunction-sections \
-@@ -84,18 +99,19 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
- 	-Wimplicit-function-declaration \
- 	-g -O3 -mcmodel=large $(TARGET_PROCESSOR)
- 
--INC := -I$(RTE_INC)
-+INC := -I$(RTE_INC) -I../intel_fapi/
- DEF :=
- 
- AS_FLAGS :=
- AR_FLAGS := rc
- 
- PROJECT_OBJ_DIR := $(BUILDDIR)/obj
-+PROJECT_DEP_DIR := $(PROJECT_OBJ_DIR)/$(PROJECT_NAME).dep.d
- 
- CC_OBJS := $(patsubst %.c,%.o,$(CC_SRC))
- AS_OBJS := $(patsubst %.s,%.o,$(AS_SRC))
- OBJS    := $(CC_OBJS) $(AS_OBJS) $(LIBS)
--DIRLIST := $(addprefix $(PROJECT_OBJ_DIR)/,$(sort $(dir $(OBJS))))
-+DIRLIST := $(addprefix $(PROJECT_OBJ_DIR)/,$(sort $(dir $(OBJS)))) $(PROJECT_DEP_DIR)
- 
- CC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CC_OBJS))
- 
-@@ -104,9 +120,7 @@ CC_FLAGS_FULL  := $(CC_FLAGS) $(INC) $(DEF)
- 
- AS_FLAGS := $(AS_FLAGS) $(INC)
- 
--PROJECT_DEP_FILE := $(PROJECT_OBJ_DIR)/$(PROJECT_NAME).dep
--
--ifeq ($(wildcard $(PROJECT_DEP_FILE)),$(PROJECT_DEP_FILE))
-+ifeq ($(wildcard $(PROJECT_DEP_DIR)),$(PROJECT_DEP_DIR))
- GENERATE_DEPS :=
- else
- 
-@@ -119,11 +133,11 @@ all : welcome_line 	$(PROJECT_BINARY)
- 
- .PHONY : clear_dep
- clear_dep:
--	@$(RM) $(PROJECT_DEP_FILE)
--	@echo [DEP]   $(subst $(PROJECT_OBJ_DIR)/,,$(PROJECT_DEP_FILE))
-+	@echo [DEP] rm $(PROJECT_DEP_DIR)/$(@F).dep
-+	@$(RM) $(PROJECT_DEP_DIR)/$(@F).dep
- 
--$(CC_DEPS) :
--	@$(CC) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.c,%.o,$(subst __up__,../,$(subst __dep__,,$@))) $(CC_FLAGS_FULL) >> $(PROJECT_DEP_FILE)
-+$(CC_DEPS) : $(PROJECT_DEP_DIR)
-+	@$(CC) $(CC_FLAGS_FULL) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.c,%.o,$(subst __up__,../,$(subst __dep__,,$@))) >> $(PROJECT_DEP_DIR)/$(@F).dep
- 
- .PHONY : generate_deps
- generate_deps : clear_dep $(CC_DEPS)
-@@ -136,17 +150,17 @@ echo_start_build :
- $(DIRLIST) :
- 	-@$(MD) $@
- 
--$(CC_OBJTARGETS) :
-+$(CC_OBJTARGETS) : $(GENERATE_DEPS)
- 	@echo [CC]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
- 	@$(CC) -c $(CC_FLAGS_FULL) -o"$@" $(patsubst %.o,%.c,$(subst $(PROJECT_OBJ_DIR)/,,$@))
- 
--$(AS_OBJTARGETS) :
-+$(AS_OBJTARGETS) : $(CC_OBJTARGETS) $(CPP_OBJTARGETS)
- 	@echo [AS]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
- 	@$(AS) $(AS_FLAGS) -o"$@" $(patsubst %.o,%.s,$(subst $(PROJECT_OBJ_DIR)/,,$@))
- 
--ifeq ($(wildcard $(PROJECT_DEP_FILE)),$(PROJECT_DEP_FILE))
-+ifeq ($(wildcard $(PROJECT_DEP_DIR)),$(PROJECT_DEP_DIR))
- 
--include $(PROJECT_DEP_FILE)
-+include $(PROJECT_DEP_DIR)/*
- 
- endif
- 
-@@ -156,7 +170,7 @@ clean:
- 	@$(RM) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
- ifneq ($(wildcard $(PROJECT_DIR)/$(PROJECT_MAKE)),)
- 	@echo [CLEAN] : $(PROJECT_NAME)
--	@$(RM) $(PROJECT_BINARY) $(PROJECT_BINARY_LIB) $(PROJECT_DEP_FILE)
-+	@$(RM) -rf $(PROJECT_BINARY) $(PROJECT_BINARY_LIB) $(PROJECT_DEP_DIR)
- endif
- 
- xclean: clean
-@@ -172,7 +186,24 @@ welcome_line :
- debug :  all
- release :  all
- 
--$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(PRE_BUILD) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
-+$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(CC_OBJTARGETS) $(AS_OBJTARGETS)
- 	@echo [AR]    $(subst $(BUILDDIR)/,,$@)
- 	@$(CC) $(CC_OBJTARGETS) $(AS_OBJTARGETS) -shared -fPIC -o $@
- 
-+##############################################################
-+#  Install configuration
-+##############################################################
-+
-+INSTALL_DIR := /usr/local
-+INCLUDE_DIR := $(INSTALL_DIR)/include/
-+
-+.PHONY : install
-+install: $(PROJECT_BINARY) install_headers
-+	@echo [INSTALL] : $(PROJECT_BINARY)
-+	@$(CP) $(PROJECT_BINARY) $(INSTALL_DIR)/lib
-+
-+.PHONY : install_headers
-+install_headers: $(CC_SRC)
-+	@echo [INSTALL] : $(PROJECT_NAME) headers
-+	@$(MD) $(INCLUDE_DIR)
-+	@$(CP) $(CC_HDR) $(INCLUDE_DIR)

cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch

@@ -1,5 +1,5 @@
 diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index 7508117..318508b 100644
+index 7508117..ce17ebd 100644
 --- a/fhi_lib/app/src/common.h
 +++ b/fhi_lib/app/src/common.h
 @@ -28,7 +28,7 @@
@@ -7,12 +7,12 @@ index 7508117..318508b 100644
  #include <rte_mbuf.h>
  
 -#define VERSIONX                "oran_e_maintenance_release_v1.0"
-+#define VERSIONX                "oran_e_maintenance_release_v1.6"
++#define VERSIONX                "oran_e_maintenance_release_v1.5"
  
  #define APP_O_DU  0
  #define APP_O_RU  1
 diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
-index de141bf..c2a448d 100644
+index de141bf..fa2923f 100644
 --- a/fhi_lib/lib/Makefile
 +++ b/fhi_lib/lib/Makefile
 @@ -23,12 +23,25 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -50,9 +50,9 @@ index de141bf..c2a448d 100644
  
 -RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 +ifeq ($(TARGET), x86)
-+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkg-config --cflags-only-I libdpdk)
++RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 +else ifeq ($(TARGET), armv8)
-+RTE_INC := $(shell pkg-config --cflags-only-I libdpdk)
++RTE_INC := $(pkgconf --cflags-only-I libdpdk)
 +endif
  API_DIR := $(PROJECT_DIR)/api
  SRC_DIR := $(PROJECT_DIR)/src
@@ -85,7 +85,7 @@ index de141bf..c2a448d 100644
  
  CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
  	-fdata-sections \
-@@ -112,14 +132,23 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
+@@ -112,12 +132,21 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
          -fPIC \
  	-Wall \
  	-Wimplicit-function-declaration \
@@ -110,11 +110,8 @@ index de141bf..c2a448d 100644
 +        -Werror -Wno-unused-variable -std=c++14
 +endif
  
--INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
-+INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) $(RTE_INC)
+ INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
  DEF :=
- ifeq ($(MLOG),1)
- 	INC  += -I$(MLOG_DIR)/source
 @@ -150,8 +179,13 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
  
  AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))

cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch

@@ -1,5 +1,5 @@
 diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index ac5f471..5efcce3 100644
+index ac5f471..9ebbcab 100644
 --- a/fhi_lib/app/src/common.h
 +++ b/fhi_lib/app/src/common.h
 @@ -28,7 +28,7 @@
@@ -7,12 +7,12 @@ index ac5f471..5efcce3 100644
  #include <rte_mbuf.h>
  
 -#define VERSIONX                "oran_f_release_v1.0"
-+#define VERSIONX                "oran_f_release_v1.4"
++#define VERSIONX                "oran_f_release_v1.3"
  
  #define APP_O_DU  0
  #define APP_O_RU  1
 diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
-index eccc4ae..a97fdc6 100644
+index eccc4ae..b1b8f4b 100644
 --- a/fhi_lib/lib/Makefile
 +++ b/fhi_lib/lib/Makefile
 @@ -23,24 +23,46 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -83,9 +83,9 @@ index eccc4ae..a97fdc6 100644
  RTE_TARGET ?= x86_64-native-linux-icc
 -RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 +ifeq ($(TARGET), x86)
-+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkg-config --cflags-only-I libdpdk)
++RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 +else ifeq ($(TARGET), armv8)
-+RTE_INC := $(shell pkg-config --cflags-only-I libdpdk)
++RTE_INC := $(pkgconf --cflags-only-I libdpdk)
 +endif
  
  API_DIR := $(PROJECT_DIR)/api
@@ -147,15 +147,6 @@ index eccc4ae..a97fdc6 100644
  
  ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
  CPP_FLAGS +=  -fp-model fast=2 -no-prec-div -no-prec-sqrt -fast-transcendentals -restrict
-@@ -150,7 +187,7 @@ CPP_FLAGS +=  -fp-model fast -march=icelake-server -mintrinsic-promote -Wno-unus
- endif
- 
- 
--INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
-+INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) $(RTE_INC)
- DEF :=
- ifeq ($(MLOG),1)
- 	INC  += -I$(MLOG_DIR)/source
 @@ -186,8 +223,13 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
  
  AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
@@ -173,7 +164,7 @@ index eccc4ae..a97fdc6 100644
  CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
  CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
 diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h
-index bacf597..1dd6d66 100644
+index bacf597..8bd7c66 100644
 --- a/fhi_lib/lib/api/xran_fh_o_du.h
 +++ b/fhi_lib/lib/api/xran_fh_o_du.h
 @@ -141,7 +141,7 @@ extern "C" {
@@ -185,15 +176,7 @@ index bacf597..1dd6d66 100644
  #define XRAN_MAX_SET_BFWS            (64)  /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */
  
  #define XRAN_MAX_PKT_BURST (448+4) /**< 4x14x8 symbols per ms */
-@@ -419,6 +419,7 @@ struct xran_io_cfg {
-     uint16_t num_rxq;             /**< number of RX queues per VF */
-     char *dpdk_dev[XRAN_VF_MAX]; /**< VFs devices  */
-     char *bbdev_dev[1];      /**< BBDev dev name */
-+    char *bbdev_vfio_vf_token[1];      /**< BBDev dev token */
-     int32_t bbdev_mode;      /**< DPDK for BBDev */
-     uint32_t dpdkIoVaMode;   /**< IOVA Mode */
-     uint32_t dpdkMemorySize; /**< DPDK max memory allocation */
-@@ -1193,6 +1194,31 @@ int32_t xran_reg_physide_cb_by_dev_id(void *pHandle, xran_fh_tti_callback_fn Cb,
+@@ -1193,6 +1193,31 @@ int32_t xran_reg_physide_cb_by_dev_id(void *pHandle, xran_fh_tti_callback_fn Cb,
   */
  int32_t xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond);
  
@@ -276,7 +259,7 @@ index 46e0e1d..409ef4b 100644
  int xran_prepare_iq_symbol_portion(
                          struct rte_mbuf *mbuf,
 diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
-index f5b2fd6..8fb0ec2 100644
+index f5b2fd6..144a65e 100644
 --- a/fhi_lib/lib/ethernet/ethdi.c
 +++ b/fhi_lib/lib/ethernet/ethdi.c
 @@ -37,7 +37,10 @@
@@ -290,37 +273,8 @@ index f5b2fd6..8fb0ec2 100644
  #include <numa.h>
  #include <rte_config.h>
  #include <rte_common.h>
-@@ -185,14 +188,24 @@ static void check_port_link_status(uint8_t portid)
-                 printf("Port %d Link Up - speed %u "
-                         "Mbps - %s\n", (uint8_t)portid,
-                         (unsigned)link.link_speed,
-+#if (RTE_VER_YEAR >= 21)
-+                        (link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX) ?
-+                        ("full-duplex") : ("half-duplex\n")
-+#else
-                         (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
--                        ("full-duplex") : ("half-duplex\n"));
-+                        ("full-duplex") : ("half-duplex\n")
-+#endif
-+                      );
-             else
-                 printf("Port %d Link Down\n",
-                         (uint8_t)portid);
-         }
-         /* clear all_ports_up flag if any link down */
-+#if (RTE_VER_YEAR >= 21)
-+        if (link.link_status == RTE_ETH_LINK_DOWN) {
-+#else
-         if (link.link_status == ETH_LINK_DOWN) {
-+#endif
-             all_ports_up = 0;
-             break;
-         }
-@@ -323,10 +336,11 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
-     uint64_t nWorkerCore = 1;
-     uint32_t coreNum = sysconf(_SC_NPROCESSORS_CONF);
+@@ -325,8 +328,8 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
      char bbdev_wdev[32]   = "";
-+    char bbdev_vfio_vf_token[64] = "";
      char bbdev_vdev[32]   = "";
      char iova_mode[32]    = "--iova-mode=pa";
 -    char socket_mem[32]   = "--socket-mem=8192";
@@ -330,36 +284,16 @@ index f5b2fd6..8fb0ec2 100644
      char ring_name[32]    = "";
      int32_t xran_port = -1;
      queueid_t qi = 0;
-@@ -336,8 +350,8 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+@@ -336,7 +339,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
      cpu = sched_getcpu();
      node = numa_node_of_cpu(cpu);
  
 -    char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto",
--        "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev};
 +    char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto", "--no-telemetry",
-+        "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev, bbdev_vfio_vf_token};
+         "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev};
  
      if (io_cfg == NULL)
-         return 0;
-@@ -347,11 +361,17 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
-             // hw-accelerated bbdev
-             printf("hw-accelerated bbdev %s\n", io_cfg->bbdev_dev[0]);
-             snprintf(bbdev_wdev, RTE_DIM(bbdev_wdev), "-a%s", io_cfg->bbdev_dev[0]);
-+	    if (io_cfg->bbdev_vfio_vf_token[0] != NULL) {
-+                snprintf(bbdev_vfio_vf_token, RTE_DIM(bbdev_vfio_vf_token), "--vfio-vf-token=%s", io_cfg->bbdev_vfio_vf_token[0]);
-+	    }
-         } else if (io_cfg->bbdev_mode == XRAN_BBDEV_MODE_HW_OFF){
-             snprintf(bbdev_wdev, RTE_DIM(bbdev_wdev), "%s", "--vdev=baseband_turbo_sw");
-         } else if (io_cfg->bbdev_mode == XRAN_BBDEV_MODE_HW_SW){
-             printf("software and hw-accelerated bbdev %s\n", io_cfg->bbdev_dev[0]);
-             snprintf(bbdev_wdev, RTE_DIM(bbdev_wdev), "-a%s", io_cfg->bbdev_dev[0]);
-+	    if (io_cfg->bbdev_vfio_vf_token[0] != NULL) {
-+                snprintf(bbdev_vfio_vf_token, RTE_DIM(bbdev_vfio_vf_token), "--vfio-vf-token=%s", io_cfg->bbdev_vfio_vf_token[0]);
-+	    }
-             snprintf(bbdev_vdev, RTE_DIM(bbdev_vdev), "%s", "--vdev=baseband_turbo_sw");
-         } else {
-             rte_panic("Cannot init DPDK incorrect [bbdev_mode %d]\n", io_cfg->bbdev_mode);
-@@ -481,11 +501,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+@@ -481,11 +484,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
                      ctx->tx_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
                      rte_lcore_to_socket_id(*lcore_id), RING_F_SC_DEQ);
                      PANIC_ON(ctx->tx_ring[i] == NULL, "failed to allocate rx ring");
@@ -373,7 +307,7 @@ index f5b2fd6..8fb0ec2 100644
                      }
                  }
              } else {
-@@ -555,7 +577,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+@@ -555,7 +560,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
          ctx->up_dl_pkt_gen_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING,
          rte_lcore_to_socket_id(*lcore_id), /*RING_F_SC_DEQ*/0);
          PANIC_ON(ctx->up_dl_pkt_gen_ring[i] == NULL, "failed to allocate dl gen ring");
@@ -383,7 +317,7 @@ index f5b2fd6..8fb0ec2 100644
  
      return 1;
 diff --git a/fhi_lib/lib/ethernet/ethernet.c b/fhi_lib/lib/ethernet/ethernet.c
-index edda598..77e5ca7 100644
+index edda598..791256c 100644
 --- a/fhi_lib/lib/ethernet/ethernet.c
 +++ b/fhi_lib/lib/ethernet/ethernet.c
 @@ -37,7 +37,10 @@
@@ -397,78 +331,6 @@ index edda598..77e5ca7 100644
  #include <rte_config.h>
  #include <rte_common.h>
  #include <rte_log.h>
-@@ -149,13 +152,22 @@ void xran_init_port(int p_id, uint16_t num_rxq, uint32_t mtu)
-     static uint16_t nb_txd = BURST_SIZE;
-     struct rte_ether_addr addr;
-     struct rte_eth_rxmode rxmode = {
-+#if (RTE_VER_YEAR >= 21)
-+            .mtu = MAX_RX_LEN,
-+#else
-             .split_hdr_size = 0,
-               .max_rx_pkt_len = MAX_RX_LEN,
-             .offloads       = DEV_RX_OFFLOAD_JUMBO_FRAME
-+#endif
-             };
-     struct rte_eth_txmode txmode = {
-+#if (RTE_VER_YEAR >= 21)
-+            .mq_mode        = RTE_ETH_MQ_TX_NONE,
-+            .offloads       = RTE_ETH_TX_OFFLOAD_MULTI_SEGS
-+#else
-             .mq_mode        = ETH_MQ_TX_NONE,
-             .offloads       = DEV_TX_OFFLOAD_MULTI_SEGS
-+#endif
-             };
-     struct rte_eth_conf port_conf = {
-             .rxmode = rxmode,
-@@ -174,8 +186,13 @@ void xran_init_port(int p_id, uint16_t num_rxq, uint32_t mtu)
-     uint32_t num_mbufs = 0;
- 
-     if (mtu <= 1500) {
-+#if (RTE_VER_YEAR >= 21)
-+        rxmode.offloads &= ~RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO;
-+        rxmode.mtu = RTE_ETHER_MAX_LEN;
-+#else
-         rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
-         rxmode.max_rx_pkt_len = RTE_ETHER_MAX_LEN;
-+#endif
-         data_room_size = MBUF_POOL_ELM_SMALL;
-     }
- 
-@@ -184,10 +201,19 @@ void xran_init_port(int p_id, uint16_t num_rxq, uint32_t mtu)
-         drv_name = dev_info.driver_name;
-     printf("initializing port %d for TX, drv=%s\n", p_id, drv_name);
- 
--    if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE){
-+#if (RTE_VER_YEAR >= 21)
-+    if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
-+#else
-+    if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
-+#endif
-+    {
-         printf("set DEV_TX_OFFLOAD_MBUF_FAST_FREE\n");
-         port_conf.txmode.offloads |=
-+#if (RTE_VER_YEAR >= 21)
-+            RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
-+#else
-             DEV_TX_OFFLOAD_MBUF_FAST_FREE;
-+#endif
-     }
- 
-     rte_eth_macaddr_get(p_id, &addr);
-@@ -293,8 +319,13 @@ void xran_add_eth_hdr_vlan(struct rte_ether_addr *dst, uint16_t ethertype, struc
-     PANIC_ON(h == NULL, "mbuf prepend of ether_hdr failed");
- 
-     /* Fill in the ethernet header. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_eth_macaddr_get(mb->port, &h->src_addr);          /* set source addr */
-+    h->dst_addr = *dst;                                   /* set dst addr */
-+#else
-     rte_eth_macaddr_get(mb->port, &h->s_addr);          /* set source addr */
-     h->d_addr = *dst;                                   /* set dst addr */
-+#endif
-     h->ether_type = rte_cpu_to_be_16(ethertype);        /* ethertype too */
- #if 0
-     struct rte_ether_addr *s = &h->s_addr;
 diff --git a/fhi_lib/lib/src/xran_bfp_ref.cpp b/fhi_lib/lib/src/xran_bfp_ref.cpp
 index e6d3067..8e0abee 100644
 --- a/fhi_lib/lib/src/xran_bfp_ref.cpp
@@ -703,7 +565,7 @@ index 789c6fd..a768efb 100644
  #include <rte_common.h>
  #include <rte_eal.h>
 diff --git a/fhi_lib/lib/src/xran_delay_measurement.c b/fhi_lib/lib/src/xran_delay_measurement.c
-index 4c943c8..7db51a8 100644
+index 4c943c8..d9e7983 100644
 --- a/fhi_lib/lib/src/xran_delay_measurement.c
 +++ b/fhi_lib/lib/src/xran_delay_measurement.c
 @@ -23,7 +23,10 @@
@@ -717,155 +579,6 @@ index 4c943c8..7db51a8 100644
  #include <assert.h>
  #include <err.h>
  #include <arpa/inet.h>
-@@ -572,16 +575,28 @@ int xran_generate_delay_meas(uint16_t port_id, void* handle, uint8_t actionType,
-     PANIC_ON(h == NULL, "mbuf prepend of ether_hdr failed");
- 
-     /* Fill in the ethernet header. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_eth_macaddr_get(port_id, &h->src_addr);          /* set source addr */
-+#else
-     rte_eth_macaddr_get(port_id, &h->s_addr);          /* set source addr */
-+#endif
- 
-     if (p_xran_dev_ctx->fh_init.io_cfg.id)
-     {
- //        rte_ether_addr_copy( (struct rte_ether_addr *)p_xran_dev_ctx->fh_init.p_o_du_addr[port_id],&h->d_addr);
-+#if (RTE_VER_YEAR >= 21)
-+        h->dst_addr = ctx->entities[port_id][ID_O_DU];   /* set dst addr */
-+#else
-         h->d_addr = ctx->entities[port_id][ID_O_DU];   /* set dst addr */
-+#endif
-     }
-     else
-     {
-+#if (RTE_VER_YEAR >= 21)
-+        h->dst_addr = ctx->entities[port_id][ID_O_RU];   /* set dst addr */
-+#else
-         h->d_addr = ctx->entities[port_id][ID_O_RU];   /* set dst addr */
-+#endif
- //        rte_ether_addr_copy( (struct rte_ether_addr *)p_xran_dev_ctx->fh_init.p_o_ru_addr[port_id],&h->d_addr);
-     }
- 
-@@ -752,7 +767,11 @@ int xran_generate_delay_meas(uint16_t port_id, void* handle, uint8_t actionType,
-         int8_t *pa = &p_xran_dev_ctx->fh_init.p_o_du_addr[0];
-         printf("DST_MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pa[0],pa[1],pa[2],pa[3],pa[4],pa[5]);
- #endif
-+#if (RTE_VER_YEAR >= 21)
-+        rte_ether_addr_copy((struct rte_ether_addr *)&p_xran_dev_ctx->fh_init.p_o_du_addr[0], (struct rte_ether_addr *)&h->dst_addr.addr_bytes[0]);
-+#else
-         rte_ether_addr_copy((struct rte_ether_addr *)&p_xran_dev_ctx->fh_init.p_o_du_addr[0], (struct rte_ether_addr *)&h->d_addr.addr_bytes[0]);
-+#endif
- 
-     }
-     else
-@@ -761,13 +780,25 @@ int xran_generate_delay_meas(uint16_t port_id, void* handle, uint8_t actionType,
-         int8_t *pb = &p_xran_dev_ctx->fh_init.p_o_ru_addr[0];
-         printf("DST_MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pb[0],pb[1],pb[2],pb[3],pb[4],pb[5]);
- #endif
-+#if (RTE_VER_YEAR >= 21)
-+        rte_ether_addr_copy((struct rte_ether_addr *)&p_xran_dev_ctx->fh_init.p_o_ru_addr[0], (struct rte_ether_addr *)&h->dst_addr.addr_bytes[0]);
-+#else
-         rte_ether_addr_copy((struct rte_ether_addr *)&p_xran_dev_ctx->fh_init.p_o_ru_addr[0], (struct rte_ether_addr *)&h->d_addr.addr_bytes[0]);
-+#endif
- 
-     }
- #ifdef XRAN_OWD_DEBUG_PKTS
-+#if (RTE_VER_YEAR >= 21)
-+    uint8_t *pc = &h->src_addr.addr_bytes[0];
-+#else
-     uint8_t *pc = &h->s_addr.addr_bytes[0];
-+#endif
-     printf(" Src MAC from packet: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pc[0],pc[1],pc[2],pc[3],pc[4],pc[5]);
-+#if (RTE_VER_YEAR >= 21)
-+    uint8_t *pd = &h->dst_addr.addr_bytes[0];
-+#else
-     uint8_t *pd = &h->d_addr.addr_bytes[0];
-+#endif
-     printf(" Dst MAC from packet: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pd[0],pd[1],pd[2],pd[3],pd[4],pd[5]);
- #endif
-     // Copy dest address from above
-@@ -862,9 +893,15 @@ int xran_process_delmeas_request(struct rte_mbuf *pkt, void* handle, struct xran
-     // 11) Fill the ethernet header properly by swapping src and dest addressed from the copied frame
-     eth_hdr = rte_pktmbuf_mtod(pkt1, struct rte_ether_hdr *);
-     /* Swap dest and src mac addresses. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_ether_addr_copy(&eth_hdr->dst_addr, &addr);
-+    rte_ether_addr_copy(&eth_hdr->src_addr, &eth_hdr->dst_addr);
-+    rte_ether_addr_copy(&addr, &eth_hdr->src_addr);
-+#else
-     rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
-     rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-     rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
-+#endif
-     // Still need to check ol_flags state and update if necessary
-     // Compute the delay td12 and save
-     // Still need to define the DB to save the info and run averages
-@@ -872,9 +909,17 @@ int xran_process_delmeas_request(struct rte_mbuf *pkt, void* handle, struct xran
-     // 12) Send the response right away
- #ifdef XRAN_OWD_DEBUG_PKTS
-     struct rte_ether_hdr *h = (struct rte_ether_hdr *)rte_pktmbuf_mtod(pkt1, struct rte_ether_hdr*);
-+#if (RTE_VER_YEAR >= 21)
-+    uint8_t *pc = &h->src_addr.addr_bytes[0];
-+#else
-     uint8_t *pc = &h->s_addr.addr_bytes[0];
-+#endif
-     printf(" Src MAC from packet: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pc[0],pc[1],pc[2],pc[3],pc[4],pc[5]);
-+#if (RTE_VER_YEAR >= 21)
-+    uint8_t *pd = &h->dst_addr.addr_bytes[0];
-+#else
-     uint8_t *pd = &h->d_addr.addr_bytes[0];
-+#endif
-     printf(" Dst MAC from packet: %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", pd[0],pd[1],pd[2],pd[3],pd[4],pd[5]);
- //    printf("EtherType: %04"PRIx16" \n",&h->ether_type);
- #endif
-@@ -1100,9 +1145,15 @@ int xran_process_delmeas_rem_request(struct rte_mbuf *pkt, void* handle, struct
-     // 9) Fill the ethernet header properly by swapping src and dest addressed from the copied frame
-     eth_hdr = rte_pktmbuf_mtod(pkt1, struct rte_ether_hdr *);
-     /* Swap dest and src mac addresses. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_ether_addr_copy(&eth_hdr->dst_addr, &addr);
-+    rte_ether_addr_copy(&eth_hdr->src_addr, &eth_hdr->dst_addr);
-+    rte_ether_addr_copy(&addr, &eth_hdr->src_addr);
-+#else
-     rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
-     rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-     rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
-+#endif
-     // 10) Send the response right away
-     pdm  = (struct xran_ecpri_del_meas_pkt*)rte_pktmbuf_mtod_offset(pkt1, struct xran_ecpri_del_meas_pkt *, sizeof(struct rte_ether_hdr) );
-     pdm->cmnhdr.bits.ecpri_payl_size	 = 10 + powdc->owdm_PlLength; // 10 correponds to the xran_ecpri_delay_meas_pl minus the dummy_bytes field which now allows the user to select the length for this field to be sent
-@@ -1177,9 +1228,15 @@ int xran_process_delmeas_rem_request_w_fup(struct rte_mbuf* pkt, void* handle, s
-     // 7) Fill the ethernet header properly by swapping src and dest addressed from the copied frame
-     eth_hdr = rte_pktmbuf_mtod(pkt1, struct rte_ether_hdr *);
-     /* Swap dest and src mac addresses. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_ether_addr_copy(&eth_hdr->dst_addr, &addr);
-+    rte_ether_addr_copy(&eth_hdr->src_addr, &eth_hdr->dst_addr);
-+    rte_ether_addr_copy(&addr, &eth_hdr->src_addr);
-+#else
-     rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
-     rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-     rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
-+#endif
-     // 8) Duplicate packet to be used for the follow up packet
-     pkt2 = rte_pktmbuf_copy(pkt1, _eth_mbuf_pool, 0, UINT32_MAX);
-     // 9) Record the current timestamp when the request with follow up is being sent
-@@ -1283,9 +1340,15 @@ int xran_process_delmeas_follow_up(struct rte_mbuf *pkt, void* handle, struct xr
-     // 9) Fill the ethernet header properly by swapping src and dest addressed from the copied frame
-     eth_hdr = rte_pktmbuf_mtod(pkt1, struct rte_ether_hdr *);
-     /* Swap dest and src mac addresses. */
-+#if (RTE_VER_YEAR >= 21)
-+    rte_ether_addr_copy(&eth_hdr->dst_addr, &addr);
-+    rte_ether_addr_copy(&eth_hdr->src_addr, &eth_hdr->dst_addr);
-+    rte_ether_addr_copy(&addr, &eth_hdr->src_addr);
-+#else
-     rte_ether_addr_copy(&eth_hdr->d_addr, &addr);
-     rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-     rte_ether_addr_copy(&addr, &eth_hdr->s_addr);
-+#endif
-     pdm  = (struct xran_ecpri_del_meas_pkt*)rte_pktmbuf_mtod_offset(pkt1, struct xran_ecpri_del_meas_pkt *, sizeof(struct rte_ether_hdr) );
-     pdm->cmnhdr.bits.ecpri_payl_size	 = 10 + powdc->owdm_PlLength; // 10 correponds to the xran_ecpri_delay_meas_pl minus the dummy_bytes field which now allows the user to select the length for this field to be sent
-     pdm->cmnhdr.bits.ecpri_payl_size    = rte_cpu_to_be_16(pdm->cmnhdr.bits.ecpri_payl_size);
 diff --git a/fhi_lib/lib/src/xran_dev.c b/fhi_lib/lib/src/xran_dev.c
 index 4acade1..c939edc 100644
 --- a/fhi_lib/lib/src/xran_dev.c
@@ -1664,7 +1377,7 @@ index 72249bc..6b30084 100644
  #include <rte_config.h>
  
 diff --git a/fhi_lib/lib/src/xran_tx_proc.c b/fhi_lib/lib/src/xran_tx_proc.c
-index 45a17a8..85ce6fa 100644
+index 45a17a8..28c5568 100644
 --- a/fhi_lib/lib/src/xran_tx_proc.c
 +++ b/fhi_lib/lib/src/xran_tx_proc.c
 @@ -35,7 +35,11 @@
@@ -1679,58 +1392,6 @@ index 45a17a8..85ce6fa 100644
  
  #include <rte_common.h>
  #include <rte_eal.h>
-@@ -1514,7 +1518,11 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
-                         mb_oran_hdr_ext->buf_addr = ext_buff;
-                         mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
-                         mb_oran_hdr_ext->buf_len = ext_buff_len;
-+#if (RTE_VER_YEAR >= 21)
-+                        mb_oran_hdr_ext->ol_flags |= RTE_MBUF_F_EXTERNAL;
-+#else
-                         mb_oran_hdr_ext->ol_flags |= EXT_ATTACHED_MBUF;
-+#endif
-                         mb_oran_hdr_ext->shinfo = p_share_data;
-                         mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
-                         mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1532,8 +1540,13 @@ xran_process_tx_sym_cp_on_opt(void* pHandle, uint8_t ctx_id, uint32_t tti, int32
- 
-                         /* Fill in the ethernet header. */
- #ifndef TRANSMIT_BURST
-+#if (RTE_VER_YEAR >= 21)
-+                        rte_eth_macaddr_get(mb_oran_hdr_ext->port, &((struct rte_ether_hdr*)pStart)->src_addr);         /* set source addr */
-+                        ((struct rte_ether_hdr*)pStart)->dst_addr = eth_ctx->entities[vf_id][ID_O_RU];                  /* set dst addr */
-+#else
-                         rte_eth_macaddr_get(mb_oran_hdr_ext->port, &((struct rte_ether_hdr*)pStart)->s_addr);         /* set source addr */
-                         ((struct rte_ether_hdr*)pStart)->d_addr = eth_ctx->entities[vf_id][ID_O_RU];                  /* set dst addr */
-+#endif
-                         ((struct rte_ether_hdr*)pStart)->ether_type = ETHER_TYPE_ECPRI_BE;                            /* ethertype */
- #endif
-                         nPktSize = sizeof(struct rte_ether_hdr)
-@@ -1878,7 +1891,11 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
-                         mb_oran_hdr_ext->buf_addr = ext_buff;
-                         mb_oran_hdr_ext->buf_iova = ((struct rte_mempool_objhdr*)RTE_PTR_SUB(mb_base, rte_mempool_objhdr_size))->iova + RTE_PTR_DIFF(ext_buff, mb_base);
-                         mb_oran_hdr_ext->buf_len = ext_buff_len;
-+#if (RTE_VER_YEAR >= 21)
-+                        mb_oran_hdr_ext->ol_flags |= RTE_MBUF_F_EXTERNAL;
-+#else
-                         mb_oran_hdr_ext->ol_flags |= EXT_ATTACHED_MBUF;
-+#endif
-                         mb_oran_hdr_ext->shinfo = p_share_data;
-                         mb_oran_hdr_ext->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM, (uint16_t)mb_oran_hdr_ext->buf_len) - rte_ether_hdr_size;
-                         mb_oran_hdr_ext->data_len = (uint16_t)(mb_oran_hdr_ext->data_len + rte_ether_hdr_size);
-@@ -1887,8 +1904,13 @@ xran_process_tx_srs_cp_on(void* pHandle, uint8_t ctx_id, uint32_t tti, int32_t s
-                         pStart = (char*)((char*)mb_oran_hdr_ext->buf_addr + mb_oran_hdr_ext->data_off);
- 
-                         /* Fill in the ethernet header. */
-+#if (RTE_VER_YEAR >= 21)
-+                        rte_eth_macaddr_get(mb_oran_hdr_ext->port, &((struct rte_ether_hdr*)pStart)->src_addr);         /* set source addr */
-+                        ((struct rte_ether_hdr*)pStart)->dst_addr = eth_ctx->entities[vf_id][ID_O_RU];                  /* set dst addr */
-+#else
-                         rte_eth_macaddr_get(mb_oran_hdr_ext->port, &((struct rte_ether_hdr*)pStart)->s_addr);         /* set source addr */
-                         ((struct rte_ether_hdr*)pStart)->d_addr = eth_ctx->entities[vf_id][ID_O_RU];                  /* set dst addr */
-+#endif
-                         ((struct rte_ether_hdr*)pStart)->ether_type = ETHER_TYPE_ECPRI_BE;                            /* ethertype */
- 
-                         nPktSize = sizeof(struct rte_ether_hdr)
 diff --git a/fhi_lib/lib/src/xran_up_api.c b/fhi_lib/lib/src/xran_up_api.c
 index fe22a1f..3fd369b 100644
 --- a/fhi_lib/lib/src/xran_up_api.c

common/5g_platform_types.h

@@ -35,24 +35,6 @@ typedef struct nssai_s {
   uint32_t sd;
 } nssai_t;
 
-// Globally Unique AMF Identifier
-typedef struct nr_guami_s {
-  uint16_t mcc;
-  uint16_t mnc;
-  uint8_t mnc_len;
-  uint8_t amf_region_id;
-  uint16_t amf_set_id;
-  uint8_t amf_pointer;
-} nr_guami_t;
-
-typedef enum {
-  PDUSessionType_ipv4 = 0,
-  PDUSessionType_ipv6 = 1,
-  PDUSessionType_ipv4v6 = 2,
-  PDUSessionType_ethernet = 3,
-  PDUSessionType_unstructured = 4
-} pdu_session_type_t;
-
 typedef enum { NON_DYNAMIC, DYNAMIC } fiveQI_t;
 
 #endif

common/config/config_common.c

@@ -308,63 +308,3 @@ void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, ch
       break;
   }
 }
-
-/**
- * @brief Assigns the default value to a configuration parameter if available.
- *
- * This function checks the type of the parameter and assigns its default value
- * if it is defined. It handles various parameter types, including strings, integers,
- * arrays, doubles, IPv4 addresses, and lists. If the parameter is marked with
- * PARAMFLAG_DONOTREAD, it is ignored.
- *
- * @param[in]  cfg       Pointer to the configuration module interface.
- * @param[in]  cfgoption Pointer to the parameter definition structure.
- * @param[in]  prefix    Optional prefix for the parameter name (can be NULL).
- * @return 1 if the default value was set, 0 if ignored, or -1 on error/unsupported type.
- */
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix)
-{
-  if( (cfgoption->paramflags & PARAMFLAG_DONOTREAD) != 0) {
-    return 0;
-  }
-
-  switch(cfgoption->type) {
-    case TYPE_STRING:
-      return config_setdefault_string(cfg, cfgoption, prefix);
-
-    case TYPE_STRINGLIST:
-      return config_setdefault_stringlist(cfg, cfgoption, prefix);
-
-    case TYPE_UINT8:
-    case TYPE_INT8:
-    case TYPE_UINT16:
-    case TYPE_INT16:
-    case TYPE_UINT32:
-    case TYPE_INT32:
-    case TYPE_MASK:
-      return config_setdefault_int(cfg, cfgoption, prefix);
-
-    case TYPE_UINT64:
-    case TYPE_INT64:
-      return config_setdefault_int64(cfg, cfgoption, prefix);
-
-    case TYPE_UINTARRAY:
-    case TYPE_INTARRAY:
-      return config_setdefault_intlist(cfg, cfgoption, prefix);
-
-    case TYPE_DOUBLE:
-      return config_setdefault_double(cfg, cfgoption, prefix);
-
-    case TYPE_IPV4ADDR:
-      return config_setdefault_ipv4addr(cfg, cfgoption, prefix);
-
-    case TYPE_LIST:
-      // No default value for list type
-      fprintf(stderr,"[CONFIG] %s.%s TYPE_LIST has no default value\n", prefix, cfgoption->optname);
-      return -1;
-
-    default:
-      fprintf(stderr,"[CONFIG] %s.%s type %i  not supported\n", prefix, cfgoption->optname, cfgoption->type);
-      return -1;
-  } /* switch on param type */
-}

common/config/config_common.h

@@ -50,7 +50,6 @@ int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptio
 int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
 void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);
 void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *fullname, int val);
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix);
 
 #ifdef __cplusplus
 }

common/config/config_paramdesc.h

@@ -53,7 +53,7 @@
 #define PARAMFLAG_PARAMSETDEF             (1 << 17)        // parameter has been set to default value in get functions
 
 /* checkedparam_t is possibly used in paramdef_t for specific parameter value validation */
-#define CONFIG_MAX_NUMCHECKVAL            64
+#define CONFIG_MAX_NUMCHECKVAL            20
 typedef struct paramdef paramdef_t;
 typedef struct configmodule_interface configmodule_interface_t;
 typedef union checkedparam {
@@ -169,6 +169,7 @@ typedef struct paramlist_def {
 
 /* Macros to get parameters with the config module API */
 #define GET_PARAMS(param_def, param_desc, prefix)                         \
+  printf("Reading '%s' section from the config file\n", #param_def);      \
   paramdef_t param_def[] = param_desc;                                    \
   config_get(config_get_if(), param_def, sizeofArray(param_def), prefix);
 

common/config/libconfig/config_libconfig.c

@@ -356,7 +356,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
           snprintf( *cfgoptions[i].strptr , cfgoptions[i].numelt, "%s", str);
           printf_params(cfg, "[LIBCONFIG] %s: \"%s\"\n", cfgpath, *cfgoptions[i].strptr);
         } else {
-          defval = config_common_getdefault(cfg, &cfgoptions[i], prefix);
+          defval = config_setdefault_string(cfg, &cfgoptions[i], prefix);
         }
 
         break;
@@ -367,7 +367,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
         if ( setting != NULL) {
           read_strlist(cfg, &cfgoptions[i], setting, cfgpath);
         } else {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_stringlist(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
@@ -383,7 +383,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
           config_check_valptr(cfg, &(cfgoptions[i]), sizeof(*cfgoptions[i].iptr), 1);
           config_assign_int(cfg, &(cfgoptions[i]), cfgpath, u);
         } else {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_int(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
@@ -401,7 +401,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
             printf_params(cfg, "[LIBCONFIG] %s: %ld\n", cfgpath, *cfgoptions[i].i64ptr);
           }
         } else {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_int64(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
@@ -413,7 +413,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
         if ( setting != NULL) {
           read_intarray(cfg, &cfgoptions[i], setting, cfgpath);
         } else {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_intlist(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
@@ -424,14 +424,14 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
           *cfgoptions[i].dblptr = dbl;
           printf_params(cfg, "[LIBCONFIG] %s: %lf\n", cfgpath, *(cfgoptions[i].dblptr));
         } else {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_double(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
 
       case TYPE_IPV4ADDR:
         if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
-          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
+          defval = config_setdefault_ipv4addr(cfg, &(cfgoptions[i]), prefix);
         } else {
           int rst = config_assign_ipv4addr(cfg, cfgoptions, str);
 

common/config/yaml/config_yaml.cpp

@@ -25,7 +25,8 @@ extern "C" {
 #include "common/config/config_userapi.h"
 void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);
 void config_check_valptr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int elt_sz, int nb_elt);
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix);
+#include "../config_userapi.h"
+#include "../config_common.h"
 }
 #include <cstring>
 #include <string>
@@ -43,6 +44,71 @@ class YamlConfig {
   }
 };
 
+void SetDefault(configmodule_interface_t *cfg, paramdef_t *param)
+{
+  switch (param->type) {
+    case TYPE_INT:
+      *param->iptr = param->defintval;
+      break;
+    case TYPE_UINT:
+      *param->uptr = param->defuintval;
+      break;
+    case TYPE_STRING:
+      if (param->defstrval != nullptr) {
+        if (param->numelt == 0) {
+          config_check_valptr(cfg, param, 1, strlen(param->defstrval) + 1);
+        }
+        sprintf(*param->strptr, "%s", param->defstrval);
+      }
+      break;
+    case TYPE_INT8:
+      *param->i8ptr = param->defintval;
+      break;
+    case TYPE_UINT8:
+      *param->u8ptr = param->defuintval;
+      break;
+    case TYPE_INT16:
+      *param->i16ptr = param->defintval;
+      break;
+    case TYPE_UINT16:
+      *param->u16ptr = param->defuintval;
+      break;
+    case TYPE_INT64:
+      *param->i64ptr = param->defint64val;
+      break;
+    case TYPE_UINT64:
+      *param->u64ptr = param->defint64val;
+      break;
+    case TYPE_DOUBLE:
+      *param->dblptr = param->defdblval;
+      break;
+    case TYPE_MASK:
+      *param->uptr = param->defuintval;
+      break;
+    case TYPE_STRINGLIST:
+      if (param->defstrlistval != nullptr) {
+        param->strlistptr = param->defstrlistval;
+      }
+      break;
+    case TYPE_INTARRAY:
+      if (param->defintarrayval) {
+        param->iptr = param->defintarrayval;
+      }
+      break;
+    case TYPE_UINTARRAY:
+      if (param->defintarrayval) {
+        param->uptr = (uint32_t *)param->defintarrayval;
+      }
+      break;
+    case TYPE_IPV4ADDR:
+      config_setdefault_ipv4addr(cfg, param, param->defstrval);
+      break;
+    default:
+      AssertFatal(false, "Unhandled type %d", param->type);
+  }
+  param->paramflags |= PARAMFLAG_PARAMSETDEF;
+}
+
 void SetNonDefault(configmodule_interface_t *cfg, const YAML::Node &node, paramdef_t *param)
 {
   auto optname = std::string(param->optname);
@@ -141,12 +207,14 @@ void SetNonDefault(configmodule_interface_t *cfg, const YAML::Node &node, paramd
   param->paramflags |= PARAMFLAG_PARAMSET;
 }
 
-void GetParam(configmodule_interface_t *cfg, const YAML::Node &node, paramdef_t *param)
+void GetParams(configmodule_interface_t *cfg, const YAML::Node &node, paramdef_t *params, int num_params)
 {
-  if (node && node[std::string(param->optname)]) {
-    SetNonDefault(cfg, node, param);
-  } else {
-    config_common_getdefault(cfg, param, nullptr);
+  for (auto i = 0; i < num_params; i++) {
+    if (node && node[std::string(params[i].optname)]) {
+      SetNonDefault(cfg, node, &params[i]);
+    } else {
+      SetDefault(cfg, &params[i]);
+    }
   }
 }
 
@@ -161,15 +229,7 @@ extern "C" int config_yaml_init(configmodule_interface_t *cfg)
   pthread_mutex_init(&cfg->memBlocks_mutex, NULL);
   memset(cfg->oneBlock, 0, sizeof(cfg->oneBlock));
 
-  try {
-    config_yaml::config = new config_yaml::YamlConfig(std::string(cfgP[0]));
-  } catch (const YAML::BadFile &e) {
-    fprintf(stderr, "[CONFIG] Error loading YAML file '%s': %s\n", cfgP[0], e.what());
-    return -1;
-  } catch (const YAML::Exception &e) {
-    fprintf(stderr, "[CONFIG] Error parsing YAML file '%s': %s\n", cfgP[0], e.what());
-    return -1;
-  }
+  config_yaml::config = new config_yaml::YamlConfig(std::string(cfgP[0]));
   return 0;
 }
 
@@ -189,14 +249,14 @@ YAML::Node find_node(const std::string &prefix, YAML::Node node)
     if (key.at(0) == '[' && key.back() == ']') {
       // The key is an index to a sequence
       if (!current.IsSequence()) {
-        throw std::invalid_argument("Expected a sequence at " + key);
+        throw std::invalid_argument("Incorrect yaml file structure");
       }
       int index = std::stoi(key.substr(1, key.size() - 2));
       current = current[index];
       continue;
     }
     if (!current.IsMap()) {
-      throw std::invalid_argument("Expected a map at " + key);
+      throw std::invalid_argument("Incorrect yaml file structure");
     }
     if (!current[key]) {
       return config_yaml::invalid_node;
@@ -212,14 +272,8 @@ extern "C" int config_yaml_get(configmodule_interface_t *cfg, paramdef_t *cfgopt
   if (prefix != nullptr) {
     p = std::string(prefix);
   }
-  YAML::Node node;
-  try {
-    node = find_node(p, YAML::Clone(config_yaml::config->config));
-    if (node == config_yaml::invalid_node) {
-      return -1;
-    }
-  } catch (const std::invalid_argument &e) {
-    fprintf(stderr, "[CONFIG] Error finding node '%s': %s\n", p.c_str(), e.what());
+  auto node = find_node(p, YAML::Clone(config_yaml::config->config));
+  if (node == config_yaml::invalid_node) {
     return -1;
   }
   for (auto i = 0; i < numoptions; i++) {
@@ -228,14 +282,7 @@ extern "C" int config_yaml_get(configmodule_interface_t *cfg, paramdef_t *cfgopt
       config_check_valptr(cfg, &cfgoptions[i], sizeof(void *), 1);
     }
   }
-  for (int i = 0; i < numoptions; i++) {
-    try {
-      config_yaml::GetParam(cfg, node, &cfgoptions[i]);
-    } catch (const YAML::Exception &e) {
-      fprintf(stderr, "[CONFIG] Config error: prefix: %s, setting: %s, error: %s\n", p.c_str(), cfgoptions[i].optname, e.what());
-      return -1;
-    }
-  }
+  config_yaml::GetParams(cfg, node, cfgoptions, numoptions);
   return numoptions;
 }
 
@@ -276,14 +323,7 @@ extern "C" int config_yaml_getlist(configmodule_interface_t *cfg,
         }
       }
 
-      for (int j = 0; j < numparams; j++) {
-        try {
-          config_yaml::GetParam(cfg, node[i], &ParamList->paramarray[i][j]);
-        } catch (const YAML::Exception &e) {
-          fprintf(stderr, "[CONFIG] Config error: prefix: %s, setting: %s, error: %s\n", path, ParamList->paramarray[i][j].optname, e.what());
-          return -1;
-        }
-      }
+      config_yaml::GetParams(cfg, node[i], ParamList->paramarray[i], numparams);
     }
   }
 

common/config/yaml/tests/CMakeLists.txt

@@ -11,5 +11,3 @@ configure_file(test_list_of_mappings.yml test_list_of_mappings.yml COPYONLY)
 configure_file(test_int_array.yaml test_int_array.yaml COPYONLY)
 configure_file(test_read_mapping_as_list.yaml test_read_mapping_as_list.yaml COPYONLY)
 configure_file(test_ipv4.yaml test_ipv4.yaml COPYONLY)
-configure_file(test_read_str_as_int.yaml test_read_str_as_int.yaml COPYONLY)
-configure_file(malformed.yaml malformed.yaml COPYONLY)

common/config/yaml/tests/malformed.yaml

@@ -1,13 +0,0 @@
-test:
-  -
-bad_file:
-  - "testvalue1"
-  - "testvalue2"
-  - "testvalue3"
-  - "testvalue4"
-  - "testvalue5"
-  - "testvalue6"
-  - "testvalue7"
-  - "testvalue8"
-  - "testvalue9"
-  - "testvalue10" - yaml error

common/config/yaml/tests/test_read_str_as_int.yaml

@@ -1,2 +0,0 @@
-test:
-  var: "test_var"

common/config/yaml/tests/test_yaml_config.cpp

@@ -78,9 +78,8 @@ TEST(yaml_config, yaml_get_existing_values) {
     uint16_t value;
     p.type = TYPE_UINT16;
     p.u16ptr = &value;
-    p.paramflags = PARAMFLAG_MANDATORY;
     char prefix[] = "test";
-    EXPECT_EQ(config_yaml_get(cfg, &p, 1, prefix), 1);
+    config_yaml_get(cfg, &p, 1, prefix);
     EXPECT_EQ(value, i);
   }
 
@@ -95,7 +94,7 @@ TEST(yaml_config, yaml_get_non_existing_values) {
   cfg->cfgP[0] = strdup("test1.yaml");
   EXPECT_EQ(config_yaml_init(cfg), 0);
 
-  // Testing parameters not present in the test node
+  // Testing paremters present in the test node
   paramdef_t p = {0};
   for (auto i = 4; i <= 5; i++) {
     sprintf(p.optname, "%s%d", "value", i);
@@ -422,43 +421,6 @@ TEST(yaml_config, test_read_ipv4) {
   free(p.defstrval);
 }
 
-TEST(yaml_config, yaml_read_str_as_int) {
-  configmodule_interface_t *cfg = static_cast<configmodule_interface_t*>(calloc(1, sizeof(*cfg)));
-  cfg->cfgP[0] = strdup("test_read_str_as_int.yaml");
-  EXPECT_EQ(config_yaml_init(cfg), 0);
-
-  // Testing paremters present in the test node
-  paramdef_t p = {0};
-  uint16_t value;
-  p.type = TYPE_UINT16;
-  p.u16ptr = &value;
-  p.paramflags = PARAMFLAG_MANDATORY;
-  char prefix[] = "test";
-  sprintf(p.optname, "%s", "var");
-  EXPECT_EQ(config_yaml_get(cfg, &p, 1, prefix), -1);
-
-
-  config_yaml_end(cfg);
-  free(cfg->cfgP[0]);
-  end_configmodule(cfg);
-}
-
-TEST(yaml_config, yaml_open_non_existing_file) {
-  configmodule_interface_t *cfg = static_cast<configmodule_interface_t*>(calloc(1, sizeof(*cfg)));
-  cfg->cfgP[0] = strdup("non_existing_file.yaml");
-  EXPECT_EQ(config_yaml_init(cfg), -1);
-  free(cfg->cfgP[0]);
-  end_configmodule(cfg);
-}
-
-TEST(yaml_config, malformed_file) {
-  configmodule_interface_t *cfg = static_cast<configmodule_interface_t*>(calloc(1, sizeof(*cfg)));
-  cfg->cfgP[0] = strdup("malformed.yaml");
-  EXPECT_EQ(config_yaml_init(cfg), -1);
-  free(cfg->cfgP[0]);
-  end_configmodule(cfg);
-}
-
 int main(int argc, char** argv)
 {
   logInit();

common/platform_types.h

@@ -207,38 +207,26 @@ typedef struct nsa_msg_t {
   uint8_t msg_buffer[MAX_MESSAGE_SIZE];
 } nsa_msg_t;
 
-typedef enum nr_lcid_rb_type { NR_LCID_NONE = 0, NR_LCID_SRB = 1, NR_LCID_DRB = 2 } nr_lcid_rb_type;
-
-typedef struct nr_lcid_rb_t {
-  nr_lcid_rb_type type;
-  union {
-    int srb_id;
-    int drb_id;
-  } choice;
-} nr_lcid_rb_t;
-
 typedef struct transport_layer_addr_s {
-  /** Transport Layer Address in bytes:
-   * - 4 bytes for IPv4 (RFC 791), 16 bytes for IPv6 (RFC 2460),
-   * - 20 bytes for both IPv4 and IPv6, with IPv4 in the first 4 bytes. */
+  /**
+   * Transport Layer Address as a bitstring:
+   * - 32 bits for IPv4 (RFC 791),
+   * - 128 bits for IPv6 (RFC 2460),
+   * - 160 bits for both IPv4 and IPv6, with IPv4 in the first 32 bits.
+   * The S1AP/NGAP layer forwards this address (bitstring<1..160>)
+   * to S1-U/NG-U without interpreting it.
+   */
   uint8_t length;
   /// Buffer: address in network byte order
   uint8_t buffer[20];
 } transport_layer_addr_t;
 
-/** @brief GTP tunnel configuration */
-typedef struct {
-  // Tunnel endpoint identifier
-  uint32_t teid;
-  // Transport layer address
-  transport_layer_addr_t addr;
-} gtpu_tunnel_t;
-
 //-----------------------------------------------------------------------------
 // GTPV1U TYPES
 //-----------------------------------------------------------------------------
 typedef uint32_t teid_t; // tunnel endpoint identifier
 typedef uint8_t ebi_t; // eps bearer id
+typedef uint8_t pdusessionid_t;
 
 //-----------------------------------------------------------------------------
 //

common/utils/T/tracer/event.c

@@ -24,11 +24,9 @@ event get_event(int socket, OBUF *event_buffer, void *database)
 again:
   if (fullread(socket, &length, 4) == -1) goto read_error;
 #ifdef T_SEND_TIME
-  if (length < sizeof(struct timespec)) goto error;
   if (fullread(socket, &t, sizeof(struct timespec)) == -1) goto read_error;
   length -= sizeof(struct timespec);
 #endif
-  if (length < sizeof(int)) goto error;
   if (fullread(socket, &type, sizeof(int)) == -1) goto read_error;
   length -= sizeof(int);
   if (event_buffer->omaxsize < length) {
@@ -50,9 +48,6 @@ again:
   return new_event(type, length, event_buffer->obuf, database);
 #endif
 
-error:
-  printf("error: bad data in get_event()\n");
-
 read_error:
   return (event){.type = -1};
 }
@@ -69,9 +64,6 @@ event new_event(int type, int length, char *buffer, void *database)
   int i;
   int offset;
 
-  /* arbitrary limit to 1GiB (to simplify size checks) */
-  if (length < 0 || length > 1024 * 1024 * 1024) goto fatal;
-
 #ifdef T_SEND_TIME
   e.sending_time = sending_time;
 #endif
@@ -95,33 +87,26 @@ event new_event(int type, int length, char *buffer, void *database)
   for (i = 0; i < f.count; i++) {
     //e.e[i].offset = offset;
     if (!strcmp(f.type[i], "int")) {
-      if (offset + 4 > length) goto fatal;
       e.e[i].type = EVENT_INT;
       e.e[i].i = *(int *)(&buffer[offset]);
       offset += 4;
     } else if (!strcmp(f.type[i], "ulong")) {
-      if (offset + sizeof(unsigned long) > length) goto fatal;
       e.e[i].type = EVENT_ULONG;
       e.e[i].ul = *(unsigned long *)(&buffer[offset]);
       offset += sizeof(unsigned long);
     } else if (!strcmp(f.type[i], "float")) {
-      if (offset + sizeof(float) > length) goto fatal;
       e.e[i].type = EVENT_FLOAT;
       e.e[i].f = *(float *)(&buffer[offset]);
       offset += sizeof(float);
     } else if (!strcmp(f.type[i], "string")) {
-      if (offset + 1 > length) goto fatal;
       e.e[i].type = EVENT_STRING;
       e.e[i].s = &buffer[offset];
-      while (offset < length && buffer[offset]) offset++;
-      if (offset == length) goto fatal;
+      while (buffer[offset]) offset++;
       offset++;
     } else if (!strcmp(f.type[i], "buffer")) {
-      if (offset + sizeof(int) > length) goto fatal;
       int len;
       e.e[i].type = EVENT_BUFFER;
       len = *(int *)(&buffer[offset]);
-      if (len <= 0 || offset + len + sizeof(int) > length) goto fatal;
       e.e[i].bsize = len;
       e.e[i].b = &buffer[offset+sizeof(int)];
       offset += len+sizeof(int);
@@ -134,8 +119,4 @@ event new_event(int type, int length, char *buffer, void *database)
   if (e.ecount==0) { printf("FORMAT not set in event %d\n", type); abort(); }
 
   return e;
-
-fatal:
-  printf("fatal: bad buffer in new_event\n");
-  abort();
 }

common/utils/T/tracer/extract_config.c

@@ -46,8 +46,8 @@ int main(int n, char **v)
 
     /* read event from file */
     if (fread(&length, 4, 1, in) != 1) break;
-    if (ebuf.omaxsize < length + 4) {
-      ebuf.omaxsize = (length + 4 + 65535) & ~65535;
+    if (ebuf.omaxsize < length) {
+      ebuf.omaxsize = (length + 65535) & ~65535;
       ebuf.obuf = realloc(ebuf.obuf, ebuf.omaxsize);
       if (ebuf.obuf == NULL) { printf("out of memory\n"); exit(1); }
     }

common/utils/T/tracer/hacks/multi-rru-clean.c

@@ -157,8 +157,8 @@ int main(int n, char **v)
 
     /* read event from file */
     if (fread(&length, 4, 1, in) != 1) break;
-    if (ebuf.omaxsize < length + 4) {
-      ebuf.omaxsize = (length + 4 + 65535) & ~65535;
+    if (ebuf.omaxsize < length) {
+      ebuf.omaxsize = (length + 65535) & ~65535;
       ebuf.obuf = realloc(ebuf.obuf, ebuf.omaxsize);
       if (ebuf.obuf == NULL) { printf("out of memory\n"); exit(1); }
     }

common/utils/T/tracer/multi.c

@@ -114,8 +114,8 @@ int read_tracee(int s, OBUF *ebuf, int *_type, int32_t *_length)
   int vpos = 0;
 
   if (fullread(s, &length, 4) == -1) return -1;
-  if (ebuf->omaxsize < length + 4) {
-    ebuf->omaxsize = (length + 4 + 65535) & ~65535;
+  if (ebuf->omaxsize < length) {
+    ebuf->omaxsize = (length + 65535) & ~65535;
     ebuf->obuf = realloc(ebuf->obuf, ebuf->omaxsize);
     if (ebuf->obuf == NULL) { printf("out of memory\n"); exit(1); }
   }
@@ -123,12 +123,10 @@ int read_tracee(int s, OBUF *ebuf, int *_type, int32_t *_length)
   memcpy(v+vpos, &length, 4);
   vpos += 4;
 #ifdef T_SEND_TIME
-  if (length < sizeof(struct timespec)) return -1;
   if (fullread(s,v+vpos,sizeof(struct timespec))==-1) return -1;
   vpos += sizeof(struct timespec);
   length -= sizeof(struct timespec);
 #endif
-  if (length < sizeof(int)) return -1;
   if (fullread(s, &type, sizeof(int)) == -1) return -1;
   memcpy(v+vpos, &type, sizeof(int));
   vpos += sizeof(int);

common/utils/T/tracer/record.c

@@ -133,8 +133,8 @@ int main(int n, char **v)
     int vpos = 0;
 
     if (fullread(socket, &length, 4) == -1) goto read_error;
-    if (ebuf.omaxsize < length + 4) {
-      ebuf.omaxsize = (length + 4 + 65535) & ~65535;
+    if (ebuf.omaxsize < length) {
+      ebuf.omaxsize = (length + 65535) & ~65535;
       ebuf.obuf = realloc(ebuf.obuf, ebuf.omaxsize);
       if (ebuf.obuf == NULL) { printf("out of memory\n"); exit(1); }
     }
@@ -142,12 +142,10 @@ int main(int n, char **v)
     memcpy(v+vpos, &length, 4);
     vpos += 4;
 #ifdef T_SEND_TIME
-    if (length < sizeof(struct timespec)) goto read_error;
     if (fullread(socket,v+vpos,sizeof(struct timespec))==-1) goto read_error;
     vpos += sizeof(struct timespec);
     length -= sizeof(struct timespec);
 #endif
-    if (length < sizeof(int)) goto read_error;
     if (fullread(socket, &type, sizeof(int)) == -1) goto read_error;
     memcpy(v+vpos, &type, sizeof(int));
     vpos += sizeof(int);

common/utils/T/tracer/replay.c

@@ -146,8 +146,8 @@ int main(int n, char **v)
 
     /* read event from file */
     if (fread(&length, 4, 1, in) != 1) break;
-    if (ebuf.omaxsize < length + 4) {
-      ebuf.omaxsize = (length + 4 + 65535) & ~65535;
+    if (ebuf.omaxsize < length) {
+      ebuf.omaxsize = (length + 65535) & ~65535;
       ebuf.obuf = realloc(ebuf.obuf, ebuf.omaxsize);
       if (ebuf.obuf == NULL) { printf("out of memory\n"); exit(1); }
     }

common/utils/ds/byte_array.c

@@ -23,21 +23,15 @@
 
 #include <assert.h>
 #include <string.h>
-#include "common/utils/utils.h" // for malloc_or_fail
-
-byte_array_t create_byte_array(const size_t len, const uint8_t* buffer)
-{
-  byte_array_t result = {.len = len};
-  if (len) {
-    result.buf = malloc_or_fail(len);
-    memcpy(result.buf, buffer, len);
-  }
-  return result;
-}
 
 byte_array_t copy_byte_array(byte_array_t src)
 {
-  return create_byte_array(src.len, src.buf);
+  byte_array_t dst = {0};
+  dst.buf = malloc(src.len);
+  assert(dst.buf != NULL && "Memory exhausted");
+  memcpy(dst.buf, src.buf, src.len);
+  dst.len = src.len;
+  return dst;
 }
 
 void free_byte_array(byte_array_t ba)

common/utils/ds/byte_array.h

@@ -28,13 +28,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define FREE_AND_ZERO_BYTE_ARRAY(BA) \
-  do {                               \
-    free_byte_array(BA);             \
-    BA.buf = NULL;                   \
-    BA.len = 0;                      \
-  } while (0)
-
 typedef struct {
   size_t len;
   uint8_t* buf;
@@ -50,6 +43,5 @@ bool eq_byte_array(const byte_array_t* m0, const byte_array_t* m1);
 
 byte_array_t cp_str_to_ba(const char* str);
 char* cp_ba_to_str(const byte_array_t ba);
-byte_array_t create_byte_array(const size_t len, const uint8_t* buffer);
 
 #endif

common/utils/ds/seq_arr.c

@@ -123,10 +123,11 @@ void seq_arr_erase_it(seq_arr_t* arr, void* start_it, void* end_it, void (*free_
     return;
 
   if (free_func != NULL) {
-    void* it = start_it;
-    while (it != end_it) {
-      free_func(it);
-      it = seq_arr_next(arr, it);
+    void* start_it = seq_arr_front(arr);
+    void* end_it = seq_arr_end(arr);
+    while (start_it != end_it) {
+      free_func(start_it);
+      start_it = seq_arr_next(arr, start_it);
     }
   }
 

common/utils/ds/seq_arr.h

@@ -34,9 +34,6 @@ SOFTWARE.
 #include <stdlib.h>
 #include <stdint.h>
 
-#define FOR_EACH_SEQ_ARR(type, var, arr) \
-  for (type var = seq_arr_front(arr); var != seq_arr_end(arr); var = seq_arr_next(arr, var))
-
 typedef struct seq_arr_s {
   uint8_t* data;
   size_t size;

common/utils/ds/tests/test_seq_array.c

@@ -36,13 +36,6 @@ static int compar(const void* m0, const void* m1)
   return 1;
 }
 
-static int free_func_call_count = 0;
-
-static void dummy_free_func(void* it)
-{
-  ++free_func_call_count;
-}
-
 int main()
 {
   seq_arr_t arr = {0};
@@ -90,19 +83,6 @@ int main()
   void* it = bsearch(&key, base, nmemb, size, compar);
   assert(seq_arr_dist(&arr, seq_arr_front(&arr), it) == 4);
 
-  // Regression test: erase a partial range only
-  // Erase 92, 93, 94 (i.e., indices 1 to 3)
-  int* start = seq_arr_at(&arr, 1);
-  int* end = seq_arr_at(&arr, 4);
-  seq_arr_erase_it(&arr, start, end, dummy_free_func);
-
-  // Now values should be: [91, 95, 96, 97, 98, 99]
-  assert(free_func_call_count == 3);
-  assert(seq_arr_size(&arr) == 6);
-  assert(*(int*)seq_arr_at(&arr, 0) == 91);
-  assert(*(int*)seq_arr_at(&arr, 1) == 95);
-  assert(*(int*)seq_arr_at(&arr, 5) == 99);
-
   // Free data structure
   seq_arr_free(&arr, NULL);
 

common/utils/nr/nr_common.c

@@ -207,7 +207,7 @@ int get_smallest_supported_bandwidth_index(int scs, frequency_range_t frequency_
   return -1; // not found
 }
 
-// Table 5.2-1 NR operating bands in FR1 & FR2 (3GPP TS 38.101) (Rel.17)
+// 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:
 // - N_OFFs for bands from 80 to 89 and band 95 is referred to UL
@@ -236,7 +236,6 @@ const nr_bandentry_t nr_bandtable[] = {{1, 1920000, 1980000, 2110000, 2170000, 2
                                        {40, 2300000, 2400000, 2300000, 2400000, 20, 460000, 100},
                                        {41, 2496000, 2690000, 2496000, 2690000, 3, 499200, 15},
                                        {41, 2496000, 2690000, 2496000, 2690000, 6, 499200, 30},
-                                       {46, 5150000, 5925000, 5150000, 5925000, 1, 743334, 15},
                                        {47, 5855000, 5925000, 5855000, 5925000, 1, 790334, 15},
                                        {48, 3550000, 3700000, 3550000, 3700000, 1, 636667, 15},
                                        {48, 3550000, 3700000, 3550000, 3700000, 2, 636668, 30},
@@ -274,11 +273,6 @@ const nr_bandentry_t nr_bandtable[] = {{1, 1920000, 1980000, 2110000, 2170000, 2
                                        {94, 880000, 915000, 1432000, 1517000, 20, 286400, 100},
                                        {95, 2010000, 2025000, 000, 000, 20, 402000, 100},
                                        {96, 5925000, 7125000, 5925000, 7125000, 1, 795000, 15},
-                                       {100, 874400, 880000, 919400, 925000, 20, 174880, 100},
-                                       {101, 1900000, 1910000, 1900000, 1910000, 20, 380000, 100},
-                                       {102, 5925000, 6425000, 5925000, 6425000, 1, 795000, 15},
-                                       {104, 6425000, 7125000, 6425000, 7125000, 1, 828334, 15},
-                                       {104, 6425000, 7125000, 6425000, 7125000, 2, 828334, 30},
                                        {254, 1610000, 1626500, 2483500, 2500000, 20, 496700, 100},
                                        {254, 1610000, 1626500, 2483500, 2500000, 2, 496700, 10},
                                        {255, 1626500, 1660500, 1525000, 1559000, 20, 305000, 100},
@@ -294,7 +288,7 @@ const nr_bandentry_t nr_bandtable[] = {{1, 1920000, 1980000, 2110000, 2170000, 2
                                        {261, 27500040, 28350000, 27500040, 28350000, 1, 2070833, 60},
                                        {261, 27500040, 28350000, 27500040, 28350000, 2, 2070833, 120}};
 
-// synchronization raster per band tables (Rel.17)
+// synchronization raster per band tables (Rel.15)
 // (38.101-1 Table 5.4.3.3-1 and 38.101-2 Table 5.4.3.3-1)
 // band nb, sub-carrier spacing index, Range of gscn (First, Step size, Last)
 // clang-format off
@@ -327,9 +321,8 @@ const sync_raster_t sync_raster[] = {
   {40, 1, 5762, 1, 5989},
   {41, 0, 6246, 3, 6717},
   {41, 1, 6252, 3, 6714},
-  {46, 1, 8993, 1, 9530},
   {48, 1, 7884, 1, 7982},
-  {50, 1, 3590, 1, 3781},
+  {50, 0, 3584, 1, 3787},
   {51, 0, 3572, 1, 3574},
   {53, 0, 6215, 1, 6232},
   {53, 1, 6221, 1, 6226},
@@ -350,13 +343,7 @@ const sync_raster_t sync_raster[] = {
   {91, 0, 3572, 1, 3574},
   {92, 0, 3584, 1, 3787},
   {93, 0, 3572, 1, 3574},
-  {94, 0, 3584, 1, 3787},
-  {96, 1, 9531, 1, 10363},
-  {100, 0, 2303, 1, 2307},
-  {101, 0, 4754, 1, 4768},
-  {101, 1, 4760, 1, 4764},
-  {102, 1, 9531, 1, 9877},
-  {104, 1, 9882, 7, 10358},
+  {94, 0, 3584, 1, 3587},
   {254, 0, 6215, 1, 6244},
   {254, 1, 6218, 1, 6241},
   {255, 0, 3818, 1, 3892},
@@ -1415,11 +1402,6 @@ uint32_t nr_timer_elapsed_time(const NR_timer_t *timer)
   return timer->counter;
 }
 
-uint32_t nr_timer_remaining_time(const NR_timer_t *timer)
-{
-  return timer->target - timer->counter;
-}
-
 void nr_timer_setup(NR_timer_t *timer, const uint32_t target, const uint32_t step)
 {
   timer->target = target;

common/utils/nr/nr_common.h

@@ -222,12 +222,6 @@ bool nr_timer_is_active(const NR_timer_t *timer);
  * @return Time passed since start of timer
  */
 uint32_t nr_timer_elapsed_time(const NR_timer_t *timer);
-/**
- * @brief To return how much time is left until the timer expires
- * @param timer Timer to be checked
- * @return Time left until the timer expires
- */
-uint32_t nr_timer_remaining_time(const NR_timer_t *timer);
 
 int set_default_nta_offset(frequency_range_t freq_range, uint32_t samples_per_subframe);