Remove references to gNB from ru_thread

Remove the references to gNB from ru_thread. This way the ru_thread
can be run without gNB being present in an executable.

CMakeLists.txt

@@ -300,14 +300,15 @@ 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")
 
-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}")
+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(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)
@@ -1147,7 +1148,6 @@ 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
@@ -1230,6 +1230,7 @@ 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
  )
 
 

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

@@ -8,13 +8,13 @@
 #define DL_ARFCN 631296
 #define TDD 1
 
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_options: "all.level=debug,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
 log_filename: "/tmp/ue.log",
 
 /* Enable remote API and Web interface */
 com_addr: "0.0.0.0:9002",
 
-include "rf_driver_20/1chan.cfg",
+include "rf_driver/config.cfg",
 
 /* If true, allow the simulation of several UEs at the same time and
 allow dynamic UE creation from remote API */
@@ -22,7 +22,6 @@ 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

@@ -0,0 +1,47 @@
+/* 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-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%%"
+  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%%"
 
 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/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"
+  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"
   LogCollect:
     - "docker logs oai-smf > %%log_dir%%/oai-smf.log"
     - "docker logs oai-amf > %%log_dir%%/oai-amf.log"
@@ -147,125 +147,127 @@ ltebox-nepes:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-00102-20.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  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
 amarisoft_ue_2x2:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2-v2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  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
 amarisoft_ue_fhi72:
   Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-multi-20897-2x2.cfg &
-  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
+  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
 amarisoft_ue_1:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
   CmdPrefix: ip netns exec ue1
   MTU: 1500
 amarisoft_ue_2:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue2 ip a show dev pdn0
   CmdPrefix: ip netns exec ue2
   MTU: 1500
 amarisoft_ue_3:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue3 ip a show dev pdn0
   CmdPrefix: ip netns exec ue3
   MTU: 1500
 amarisoft_ue_4:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue4 ip a show dev pdn0
   CmdPrefix: ip netns exec ue4
   MTU: 1500
 amarisoft_ue_5:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue5 ip a show dev pdn0
   CmdPrefix: ip netns exec ue5
   MTU: 1500
 amarisoft_ue_6:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue6 ip a show dev pdn0
   CmdPrefix: ip netns exec ue6
   MTU: 1500
 amarisoft_ue_7:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue7 ip a show dev pdn0
   CmdPrefix: ip netns exec ue7
   MTU: 1500
 amarisoft_ue_8:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue8 ip a show dev pdn0
   CmdPrefix: ip netns exec ue8
   MTU: 1500
 amarisoft_ue_9:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue9 ip a show dev pdn0
   CmdPrefix: ip netns exec ue9
   MTU: 1500
 amarisoft_ue_10:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue10 ip a show dev pdn0
   CmdPrefix: ip netns exec ue10
   MTU: 1500
 amarisoft_ue_11:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue11 ip a show dev pdn0
   CmdPrefix: ip netns exec ue11
   MTU: 1500
 amarisoft_ue_12:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue12 ip a show dev pdn0
   CmdPrefix: ip netns exec ue12
   MTU: 1500
 amarisoft_ue_13:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue13 ip a show dev pdn0
   CmdPrefix: ip netns exec ue13
   MTU: 1500
 amarisoft_ue_14:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue14 ip a show dev pdn0
   CmdPrefix: ip netns exec ue14
   MTU: 1500
 amarisoft_ue_15:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue15 ip a show dev pdn0
   CmdPrefix: ip netns exec ue15
   MTU: 1500
 amarisoft_ue_16:
   Host: amariue
-  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}'
+  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}'
   NetworkScript: ip netns exec ue16 ip a show dev pdn0
   CmdPrefix: ip netns exec ue16
   MTU: 1500

ci-scripts/cls_containerize.py

@@ -152,19 +152,6 @@ 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:
@@ -311,7 +298,6 @@ class Containerize():
 		self.yamlPath = ['', '', '']
 		self.services = ['', '', '']
 		self.deploymentTag = ''
-		self.eNB_logFile = ['', '', '']
 
 		self.testCase_id = ''
 
@@ -320,17 +306,6 @@ 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
@@ -498,10 +473,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.*.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc.src.2025.05.20.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.*.tar.gz')
+				cmd.run('rm -f nvipc.src.2025.05.20.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}/")
@@ -712,7 +687,7 @@ class Containerize():
 		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
 
 		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
+		ret = cmd.run(f'docker run -a STDOUT --workdir /oai-ran/build/ --env LD_LIBRARY_PATH=/oai-ran/build/ --rm ran-unittests:{baseTag} ctest --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)
@@ -872,31 +847,24 @@ 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 -- {services}')
-				if status.returncode != 0:
+				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:
 					msg = f'cannot deploy services {services}: {status.stdout}'
 					logging.error(msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [msg])
-					return False
-				for svc in services.split():
-					health, msg = GetServiceHealth(ssh, svc, f'{wd_yaml}')
-					logging.info(msg)
-					imagesInfo.append(msg)
-					healthInfo.append(health)
-				deployed = all(healthInfo)
-				if deployed:
+				else:
 					break
-				elif (attempt < num_attempts - 1):
-					warning_msg = f'Restart services {services}'
+				if (attempt < num_attempts - 1):
+					warning_msg = (f'Failed to deploy on attempt {attempt}, restart services {services}')
 					logging.warning(warning_msg)
-					imagesInfo.append(warning_msg)
-					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', ['\n'.join(imagesInfo)])
+					HTML.CreateHtmlTestRowQueue('N/A', 'NOK', [warning_msg])
 					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,7 +224,6 @@ 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, command_fail):
+def Custom_Command(HTML, node, command):
     logging.info(f"Executing custom command on {node}")
     cmd = cls_cmd.getConnection(node)
     ret = cmd.run(command)
@@ -221,26 +221,20 @@ def Custom_Command(HTML, node, command, command_fail):
     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 and not command_fail:
-        message = [ret.stdout]
-        logging.warning(f'Custom_Command output: {message}')
-        status = 'Warning'
-    if ret.returncode != 0 and command_fail:
+    if ret.returncode != 0:
         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, command_fail):
+def Custom_Script(HTML, node, script):
 	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 and not command_fail:
-		status = 'Warning'
-	if ret.returncode != 0 and command_fail:
+	if ret.returncode != 0:
 		status = 'KO'
 	HTML.CreateHtmlTestRowQueue(script, status, message)
 	return status == 'OK' or status == 'Warning'

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

@@ -58,6 +58,14 @@ 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,6 +163,31 @@ 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.nsa.band78.106prb.usrpb200.conf

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

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

@@ -149,6 +149,8 @@ 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;
@@ -193,6 +195,15 @@ 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,7 +21,6 @@ gNBs =
 
     sib1_tda                                                  = 15;
     min_rxtxtime                                              = 6;
-    beam_weights = [0]; // single SSB -> one analog beam
 
     servingCellConfigCommon = (
     {
@@ -179,6 +178,7 @@ 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 = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "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 = "no";
+  drb_integrity = "yes";
 };
 
 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 = ( "nea0" );
+  ciphering_algorithms = ( "nea2", "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 = "no";
+  drb_integrity = "yes";
 };
 
 log_config :

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

@@ -185,6 +185,7 @@ 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,6 +19,9 @@ 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
@@ -32,3 +35,6 @@ 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,6 +19,9 @@ 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
@@ -32,3 +35,6 @@ 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,6 +19,9 @@ 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
@@ -32,3 +35,6 @@ 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,6 +19,9 @@ 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
@@ -32,3 +35,6 @@ 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,14 +376,12 @@ def ExecuteActionWithParam(action):
 			# Change all execution targets to localhost
 			node = 'localhost'
 		command = test.findtext('command')
-		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
-		success = cls_oaicitest.Custom_Command(HTML, node, command, command_fail)
+		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
 		node = test.findtext('node')
 		script = test.findtext('script')
-		command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes']
-		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
+		success = cls_oaicitest.Custom_Script(HTML, node, script)
 
 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -626,6 +624,7 @@ 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):
@@ -639,7 +638,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				break
 			try:
 				test_succeeded = ExecuteActionWithParam(action)
-				if not test_succeeded:
+				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:
 					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,7 +95,6 @@ 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,6 +27,8 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <TestCaseRequestedList>
  000001
+ 000011
+ 000012
  000002
  000003
  000004
@@ -38,7 +40,21 @@
                 <desc>This should succeed</desc>
                 <node>localhost</node>
                 <command>true</command>
-                <command_fail>yes</command_fail>
+        </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>
         </testCase>
 
         <testCase id="000002">
@@ -46,7 +62,6 @@
                 <desc>This should fail</desc>
                 <node>localhost</node>
                 <command>false</command>
-                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000003">
@@ -54,7 +69,6 @@
                 <desc>This should be skipped</desc>
                 <node>localhost</node>
                 <command>true</command>
-                <command_fail>yes</command_fail>
         </testCase>
 
         <testCase id="000004">
@@ -63,6 +77,5 @@
                 <always_exec>true</always_exec>
                 <node>localhost</node>
                 <command>true</command>
-                <command_fail>yes</command_fail>
         </testCase>
 </testCaseList>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -134,7 +134,6 @@
                 <desc>Simulate a DL radio channel with noise (3 dB)</desc>
                 <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">
@@ -166,7 +165,6 @@
                 <desc>Trigger Reestablishment</desc>
                 <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">
@@ -185,7 +183,6 @@
                 <desc>Verify Reestablishment</desc>
                 <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">
@@ -193,7 +190,6 @@
                 <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
                 <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">
@@ -201,7 +197,6 @@
                 <desc>Get UE sync state (UE ID 0)</desc>
                 <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">
@@ -209,7 +204,6 @@
                 <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
                 <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">
@@ -217,7 +211,6 @@
                 <desc>Get UE sync state (UE ID 0)</desc>
                 <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">
@@ -225,7 +218,6 @@
                 <desc>Trigger Handover</desc>
                 <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">
@@ -233,7 +225,6 @@
                 <desc>UE (1) connected to DU-PCI 0?</desc>
                 <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">
@@ -241,7 +232,6 @@
                 <desc>UE (1) connected to DU-PCI 1?</desc>
                 <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_flexric_rfsim.xml

@@ -32,7 +32,6 @@
  000001
  000002
  000003
- 002001
  010000
  000004
  333333
@@ -40,7 +39,6 @@
  010002
  010003
  020005
- 010013
  002006
  444444
  100002
@@ -50,12 +48,6 @@
         </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>
@@ -173,43 +165,39 @@
         </testCase>
 
         <testCase id="010000">
-                <class>Custom_Command</class>
+                <class>Deploy_Object</class>
                 <desc>RC 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_rc_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/rc-moni-010000.log</command>
+                <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>
         </testCase>
 
         <testCase id="010001">
-                <class>Custom_Command</class>
+                <class>Deploy_Object</class>
                 <desc>KPM 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_kpm_moni" > ../cmake_targets/log/5g_rfsimulator_flexric/kpm-moni-010001.log</command>
+                <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>
         </testCase>
 
         <testCase id="010002">
-                <class>Custom_Command</class>
+                <class>Deploy_Object</class>
                 <desc>KPM monitoring and RC control</desc>
-                <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>
+                <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>
         </testCase>
 
         <testCase id="010003">
-                <class>Custom_Command</class>
+                <class>Deploy_Object</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-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>
+                <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>
         </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -242,7 +242,7 @@
 
         <testCase id="444445">
                 <class>Detach_UE</class>
-                <desc>Detach OAI UE 2 to 10</desc>
+                <desc>Detach OAI UE 3 to 10</desc>
                 <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
                 <nodes>cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix cacofonix</nodes>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -151,7 +151,6 @@
                 <desc>Force Msg3 C-RNTI RA</desc>
                 <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">
@@ -159,7 +158,6 @@
                 <desc>Force RRC_IDLE (UE ID 0)</desc>
                 <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_fr2_32prb.xml

@@ -29,6 +29,7 @@
  800813
  000000
  000001
+ 000013
  020001
  020002
  100001
@@ -68,6 +69,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>cacofonix</nodes>
+        </testCase>
+
         <testCase id="020001">
                 <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -33,6 +33,11 @@
  000003
  020001
  020002
+ 040001
+ 020022
+ 040002
+ 020001
+ 020002
  100001
  222222
         </TestCaseRequestedList>
@@ -98,6 +103,33 @@
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="040001">
+                <class>Custom_Command</class>
+                <desc>Trigger Reestablishment</desc>
+                <node>cacofonix</node>
+                <command>echo ci force_reestab | nc 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>cacofonix</nodes>
+                <svr_id>rfsim5g_ext_dn</svr_id>
+                <svr_node>cacofonix</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>cacofonix</node>
+                <command>echo ci get_reestab_count | nc 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_sidelink.xml

@@ -79,7 +79,6 @@
                 <desc>Check that UE synched</desc>
                 <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

@@ -108,14 +108,6 @@
                 <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_nsa_b200_quectel.xml

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

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)(multi-ue profile)</desc>
+    <desc>iperf (DL/3Mbps/UDP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (UL/1Mbps/UDP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (DL/4Mbps/UDP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (UL/1.5Mbps/UDP)(30 sec)</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)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)</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,14 +200,12 @@
     <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,14 +188,12 @@
     <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,14 +233,12 @@
     <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,7 +49,6 @@
     <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">
@@ -92,7 +91,7 @@
 
   <testCase id="100010">
     <class>Iperf</class>
-    <desc>iperf (DL/570Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/570Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 570M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -103,7 +102,7 @@
 
   <testCase id="100030">
     <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -112,7 +111,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/100Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 100M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -123,7 +122,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -166,7 +165,6 @@
     <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,6 +36,7 @@
     100020
     100030
     100040
+    100011
     103000
     100002
     130000
@@ -49,7 +50,6 @@
     <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)(multi-ue profile)</desc>
+    <desc>iperf (DL/600Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 600M -t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -99,9 +99,20 @@
     <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)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)</desc>
     <iperf_args>-t 30 -R</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
@@ -110,7 +121,7 @@
 
   <testCase id="100020">
     <class>Iperf</class>
-    <desc>iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/80Mbps/UDP)(30 sec)</desc>
     <iperf_args>-u -b 80M -t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -121,7 +132,7 @@
 
   <testCase id="100040">
     <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)</desc>
     <iperf_args>-t 30</iperf_args>
     <id>up2-fhi72</id>
     <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
@@ -164,7 +175,6 @@
     <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,14 +194,12 @@
     <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: 10s
+            interval: 20s
             timeout: 5s
             retries: 5
 

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

@@ -2,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,13 +65,16 @@ 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"
@@ -78,6 +85,8 @@ 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,6 +112,8 @@ 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
@@ -130,6 +141,8 @@ 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
@@ -161,6 +174,8 @@ 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
@@ -193,6 +208,8 @@ 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,6 +2,7 @@ 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
@@ -15,6 +16,8 @@ services:
             test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
             interval: 10s
             timeout: 5s
+            start_period: 10s
+            start_interval: 500ms
             retries: 30
         networks:
             public_net:
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -80,6 +87,8 @@ 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
@@ -99,6 +108,8 @@ 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:
@@ -126,6 +137,8 @@ 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,6 +67,18 @@ 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
@@ -546,8 +558,7 @@ section in the file for details. This includes an image build service as well as
 code compilation service. This is necessary as the executable has to be linked
 against the same libraries that are present in the executing image. This might
 take a while the first time but other that that is very fast. Here is a list of
-commands (wait between each command). Tested with `docker compose` v2.27.0
-
+commands (wait between each command). Tested with `docker compose` v2.36.2.
 
 This command deploys OAI 5G Core Network
 ```bash

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

@@ -2,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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
@@ -97,6 +106,8 @@ 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,6 +132,8 @@ 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
@@ -145,6 +158,8 @@ 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
@@ -169,6 +184,8 @@ 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
@@ -193,6 +210,8 @@ 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
@@ -217,6 +236,8 @@ 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
@@ -241,6 +262,8 @@ 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
@@ -265,6 +288,8 @@ 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
@@ -289,6 +314,8 @@ 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
@@ -313,6 +340,8 @@ 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,6 +366,8 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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
@@ -97,6 +106,8 @@ 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
@@ -124,6 +135,8 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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
@@ -97,6 +106,8 @@ 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
@@ -123,6 +134,8 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,8 +65,10 @@ 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}
@@ -87,6 +93,8 @@ 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
@@ -116,6 +124,8 @@ 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
@@ -148,6 +158,8 @@ 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
@@ -180,6 +192,8 @@ 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
@@ -209,6 +223,8 @@ 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
@@ -241,6 +257,8 @@ 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
@@ -273,6 +291,8 @@ 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
@@ -301,6 +321,8 @@ 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
@@ -329,6 +351,8 @@ 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
@@ -358,6 +382,8 @@ 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_PATH = /flexric/db/
-DB_NAME = xapp_rnis_db
+DB_DIR = /tmp/

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

@@ -7,12 +7,79 @@ 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
@@ -27,7 +94,6 @@ 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
@@ -72,9 +138,6 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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,6 +105,8 @@ 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
@@ -124,6 +135,8 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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
@@ -87,7 +96,9 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
-            ASAN_OPTIONS: detect_leaks=0
+                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.140
+                                    --telnetsrv.shrmod ci
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -97,6 +108,8 @@ 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
@@ -122,6 +135,8 @@ 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,6 +13,8 @@ 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
@@ -61,8 +63,10 @@ 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
@@ -77,6 +81,8 @@ 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
@@ -97,6 +103,8 @@ 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
@@ -129,6 +137,8 @@ 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,6 +18,8 @@ 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
@@ -43,6 +45,8 @@ 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
@@ -56,11 +60,3 @@ 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,6 +2,7 @@ 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
@@ -13,6 +14,8 @@ 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
@@ -46,6 +49,7 @@ services:
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.1.9
+        init: true
         environment:
             - TZ=Europe/Paris
         volumes:
@@ -61,12 +65,15 @@ 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"
@@ -77,6 +84,8 @@ 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
@@ -99,6 +108,8 @@ 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
@@ -121,6 +132,8 @@ 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
@@ -146,6 +159,8 @@ 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,7 +14,9 @@ services:
         volumes:
           - ../../conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
+            test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
+            start_period: 15s
+            start_interval: 500ms
+            interval: 5s
             timeout: 5s
             retries: 5

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

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

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

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

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

@@ -9,6 +9,7 @@ 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
@@ -16,9 +17,6 @@ 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
@@ -26,12 +24,3 @@ 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,10 +22,12 @@ services:
             oai-net:
                 ipv4_address: 172.21.18.20
         healthcheck:
-           test: /bin/bash -c "pgrep nr-softmodem"
-           interval: 10s
+           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
+           start_period: 15s
+           start_interval: 500ms
+           interval: 5s
            timeout: 5s
-           retries: 5
+           retries: 10
 networks:
     oai-net:
         driver: macvlan

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

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

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

@@ -21,10 +21,13 @@ services:
             oai-net:
                 ipv4_address: 172.21.18.20
         healthcheck:
-           test: /bin/bash -c "pgrep nr-softmodem"
-           interval: 10s
+           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
+           start_period: 15s
+           start_interval: 500ms
+           interval: 5s
            timeout: 5s
-           retries: 5
+           retries: 10
+
 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:24-3
+    image: cubb-build:25-1
     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-20"
+    cpuset: "13-14"
     image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aerial:${TAG:-develop}
     depends_on:
       nv-cubb:

common/5g_platform_types.h

@@ -35,6 +35,24 @@ 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,3 +308,63 @@ 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,6 +50,7 @@ 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            20
+#define CONFIG_MAX_NUMCHECKVAL            64
 typedef struct paramdef paramdef_t;
 typedef struct configmodule_interface configmodule_interface_t;
 typedef union checkedparam {
@@ -169,7 +169,6 @@ 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_setdefault_string(cfg, &cfgoptions[i], prefix);
+          defval = config_common_getdefault(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_setdefault_stringlist(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(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_setdefault_int(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(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_setdefault_int64(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(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_setdefault_intlist(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(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_setdefault_double(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
         }
 
         break;
 
       case TYPE_IPV4ADDR:
         if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
-          defval = config_setdefault_ipv4addr(cfg, &(cfgoptions[i]), prefix);
+          defval = config_common_getdefault(cfg, &(cfgoptions[i]), prefix);
         } else {
           int rst = config_assign_ipv4addr(cfg, cfgoptions, str);
 

common/config/yaml/config_yaml.cpp

@@ -25,8 +25,7 @@ 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);
-#include "../config_userapi.h"
-#include "../config_common.h"
+int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix);
 }
 #include <cstring>
 #include <string>
@@ -44,71 +43,6 @@ 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);
@@ -207,14 +141,12 @@ void SetNonDefault(configmodule_interface_t *cfg, const YAML::Node &node, paramd
   param->paramflags |= PARAMFLAG_PARAMSET;
 }
 
-void GetParams(configmodule_interface_t *cfg, const YAML::Node &node, paramdef_t *params, int num_params)
+void GetParam(configmodule_interface_t *cfg, const YAML::Node &node, paramdef_t *param)
 {
-  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]);
-    }
+  if (node && node[std::string(param->optname)]) {
+    SetNonDefault(cfg, node, param);
+  } else {
+    config_common_getdefault(cfg, param, nullptr);
   }
 }
 
@@ -229,7 +161,15 @@ extern "C" int config_yaml_init(configmodule_interface_t *cfg)
   pthread_mutex_init(&cfg->memBlocks_mutex, NULL);
   memset(cfg->oneBlock, 0, sizeof(cfg->oneBlock));
 
-  config_yaml::config = new config_yaml::YamlConfig(std::string(cfgP[0]));
+  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;
+  }
   return 0;
 }
 
@@ -249,14 +189,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("Incorrect yaml file structure");
+        throw std::invalid_argument("Expected a sequence at " + key);
       }
       int index = std::stoi(key.substr(1, key.size() - 2));
       current = current[index];
       continue;
     }
     if (!current.IsMap()) {
-      throw std::invalid_argument("Incorrect yaml file structure");
+      throw std::invalid_argument("Expected a map at " + key);
     }
     if (!current[key]) {
       return config_yaml::invalid_node;
@@ -272,8 +212,14 @@ extern "C" int config_yaml_get(configmodule_interface_t *cfg, paramdef_t *cfgopt
   if (prefix != nullptr) {
     p = std::string(prefix);
   }
-  auto node = find_node(p, YAML::Clone(config_yaml::config->config));
-  if (node == config_yaml::invalid_node) {
+  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());
     return -1;
   }
   for (auto i = 0; i < numoptions; i++) {
@@ -282,7 +228,14 @@ extern "C" int config_yaml_get(configmodule_interface_t *cfg, paramdef_t *cfgopt
       config_check_valptr(cfg, &cfgoptions[i], sizeof(void *), 1);
     }
   }
-  config_yaml::GetParams(cfg, node, cfgoptions, numoptions);
+  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;
+    }
+  }
   return numoptions;
 }
 
@@ -323,7 +276,14 @@ extern "C" int config_yaml_getlist(configmodule_interface_t *cfg,
         }
       }
 
-      config_yaml::GetParams(cfg, node[i], ParamList->paramarray[i], numparams);
+      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;
+        }
+      }
     }
   }
 

common/config/yaml/tests/CMakeLists.txt

@@ -11,3 +11,5 @@ 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

@@ -0,0 +1,13 @@
+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

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

common/config/yaml/tests/test_yaml_config.cpp

@@ -78,8 +78,9 @@ TEST(yaml_config, yaml_get_existing_values) {
     uint16_t value;
     p.type = TYPE_UINT16;
     p.u16ptr = &value;
+    p.paramflags = PARAMFLAG_MANDATORY;
     char prefix[] = "test";
-    config_yaml_get(cfg, &p, 1, prefix);
+    EXPECT_EQ(config_yaml_get(cfg, &p, 1, prefix), 1);
     EXPECT_EQ(value, i);
   }
 
@@ -94,7 +95,7 @@ TEST(yaml_config, yaml_get_non_existing_values) {
   cfg->cfgP[0] = strdup("test1.yaml");
   EXPECT_EQ(config_yaml_init(cfg), 0);
 
-  // Testing paremters present in the test node
+  // Testing parameters not present in the test node
   paramdef_t p = {0};
   for (auto i = 4; i <= 5; i++) {
     sprintf(p.optname, "%s%d", "value", i);
@@ -421,6 +422,43 @@ 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,26 +207,38 @@ 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 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.
-   */
+  /** 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. */
   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,9 +24,11 @@ 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) {
@@ -48,6 +50,9 @@ 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};
 }
@@ -64,6 +69,9 @@ 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
@@ -87,26 +95,33 @@ 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 (buffer[offset]) offset++;
+      while (offset < length && buffer[offset]) offset++;
+      if (offset == length) goto fatal;
       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);
@@ -119,4 +134,8 @@ 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) {
-      ebuf.omaxsize = (length + 65535) & ~65535;
+    if (ebuf.omaxsize < length + 4) {
+      ebuf.omaxsize = (length + 4 + 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) {
-      ebuf.omaxsize = (length + 65535) & ~65535;
+    if (ebuf.omaxsize < length + 4) {
+      ebuf.omaxsize = (length + 4 + 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) {
-    ebuf->omaxsize = (length + 65535) & ~65535;
+  if (ebuf->omaxsize < length + 4) {
+    ebuf->omaxsize = (length + 4 + 65535) & ~65535;
     ebuf->obuf = realloc(ebuf->obuf, ebuf->omaxsize);
     if (ebuf->obuf == NULL) { printf("out of memory\n"); exit(1); }
   }
@@ -123,10 +123,12 @@ 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) {
-      ebuf.omaxsize = (length + 65535) & ~65535;
+    if (ebuf.omaxsize < length + 4) {
+      ebuf.omaxsize = (length + 4 + 65535) & ~65535;
       ebuf.obuf = realloc(ebuf.obuf, ebuf.omaxsize);
       if (ebuf.obuf == NULL) { printf("out of memory\n"); exit(1); }
     }
@@ -142,10 +142,12 @@ 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) {
-      ebuf.omaxsize = (length + 65535) & ~65535;
+    if (ebuf.omaxsize < length + 4) {
+      ebuf.omaxsize = (length + 4 + 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,15 +23,21 @@
 
 #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)
 {
-  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;
+  return create_byte_array(src.len, src.buf);
 }
 
 void free_byte_array(byte_array_t ba)

common/utils/ds/byte_array.h

@@ -28,6 +28,13 @@
 #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;
@@ -43,5 +50,6 @@ 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,11 +123,10 @@ void seq_arr_erase_it(seq_arr_t* arr, void* start_it, void* end_it, void (*free_
     return;
 
   if (free_func != NULL) {
-    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);
+    void* it = start_it;
+    while (it != end_it) {
+      free_func(it);
+      it = seq_arr_next(arr, it);
     }
   }
 

common/utils/ds/seq_arr.h

@@ -34,6 +34,9 @@ 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,6 +36,13 @@ 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};
@@ -83,6 +90,19 @@ 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)
+// Table 5.2-1 NR operating bands in FR1 & FR2 (3GPP TS 38.101) (Rel.17)
 // 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,6 +236,7 @@ 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},
@@ -273,6 +274,11 @@ 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},
@@ -288,7 +294,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.15)
+// synchronization raster per band tables (Rel.17)
 // (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
@@ -321,8 +327,9 @@ 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, 0, 3584, 1, 3787},
+  {50, 1, 3590, 1, 3781},
   {51, 0, 3572, 1, 3574},
   {53, 0, 6215, 1, 6232},
   {53, 1, 6221, 1, 6226},
@@ -343,7 +350,13 @@ 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, 3587},
+  {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},
   {254, 0, 6215, 1, 6244},
   {254, 1, 6218, 1, 6241},
   {255, 0, 3818, 1, 3892},

common/utils/ocp_itti/intertask_interface.cpp

@@ -475,41 +475,5 @@ typedef struct timer_elm_s {
     return 0;
   }
 
-void log_scheduler(const char* label)
-{
-    int policy = sched_getscheduler(0);
-    struct sched_param param;
-    if (sched_getparam(0, &param) == -1)
-    {
-        LOG_E(HW, "sched_getparam: %s\n", strerror(errno));
-        abort();
-    }
-
-    cpu_set_t cpu_set;
-    if (sched_getaffinity(0, sizeof(cpu_set), &cpu_set) == -1)
-    {
-        LOG_E(HW, "sched_getaffinity: %s\n", strerror(errno));
-        abort();
-    }
-    int num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-    if (num_cpus < 1)
-    {
-        LOG_E(HW, "sysconf(_SC_NPROCESSORS_ONLN): %s\n", strerror(errno));
-        abort();
-    }
-    char buffer[num_cpus];
-    for (int i = 0; i < num_cpus; i++)
-    {
-        buffer[i] = CPU_ISSET(i, &cpu_set) ? 'Y' : '-';
-    }
-
-    LOG_A(HW, "Scheduler policy=%d priority=%d affinity=[%d]%.*s label=%s\n",
-          policy,
-          param.sched_priority,
-          num_cpus,
-          num_cpus,
-          buffer,
-          label);
-}
 } // extern "C"
 

common/utils/ocp_itti/intertask_interface.h

@@ -566,7 +566,6 @@ int timer_remove(long timer_id);
 int signal_handle(int *end);
 int signal_mask(void);
 
-void log_scheduler(const char *label);
 #ifdef __cplusplus
 }
 #endif

common/utils/telnetsrv/telnetsrv_o1.c

@@ -34,7 +34,7 @@
 
 #include "openair2/RRC/NR/nr_rrc_defs.h"
 #include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
-#include "openair2/RRC/NR/nr_rrc_config.h"
+#include "openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c"
 #include "common/utils/nr/nr_common.h"

common/utils/utils.c

@@ -7,34 +7,6 @@
 #include <errno.h>
 #include "utils.h"
 
-
-
-const char *hexdump(const void *data, size_t data_len, char *out, size_t out_len)
-{
-    char *p = out;
-    char *endp = out + out_len;
-    const uint8_t *q = data;
-    snprintf(p, endp - p, "[%zu]", data_len);
-    p += strlen(p);
-    for (size_t i = 0; i < data_len; ++i)
-    {
-        if (p >= endp)
-        {
-            static const char ellipses[] = "...";
-            char *s = endp - sizeof(ellipses);
-            if (s >= p)
-            {
-                strcpy(s, ellipses);
-            }
-            break;
-        }
-        snprintf(p, endp - p, " %02X", *q++);
-        p += strlen(p);
-    }
-    return out;
-}
-
-
 /****************************************************************************
  **                                                                        **
  ** Name:        hex_char_to_hex_value()                                   **

common/utils/utils.h

@@ -109,8 +109,6 @@ static inline void *malloc_or_fail(size_t size)
 #define PAGE_MASK 0xfffff000
 #define virt_to_phys(x) (x)
 
-const char *hexdump(const void *data, size_t data_len, char *out, size_t out_len);
-
 // Converts an hexadecimal ASCII coded digit into its value. **
 int hex_char_to_hex_value (char c);
 // Converts an hexadecimal ASCII coded string into its value.**

doc/Doxyfile

@@ -1677,6 +1677,7 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_direct.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/nr_radio_config.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h \
@@ -1687,6 +1688,7 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_gNB/nr_radio_config.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/openair2_proc.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/RLC/rlc.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/LAYER2/NR_MAC_UE/mac_tables.c \
@@ -1847,7 +1849,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_if.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_direct.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_direct.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.h \
@@ -1858,7 +1859,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_UE_context.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_e1ap.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_config.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_radio_bearers.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_NGAP.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/mac_rrc_dl_f1ap.c \

doc/RUNMODEM.md

@@ -231,6 +231,9 @@ Or by providing this the the command line parameters:
 
 The main parameters to cope with the large NTN propagation delay are cellSpecificKoffset, ta-Common, ta-CommonDrift and the ephemeris data (satellite position and velocity vectors).
 
+The parameter `ntn-UlSyncValidityDuration-r17` indicates the maximum time duration from epochtime during which the UE can apply assistance information without having acquired new assistance information. i.e this enables UE to re-read SIB19 before timer with value ulSyncValidityDuration expires. The unit of the field is in seconds. Example values for GEO: 240s, MEO: 20s, LEO: 5s.
+As epochtime is not implemented yet, UE starts the timer from the TTI where SIB19 is received with ntn-UlSyncValidityDuration-r17 IE.
+
 The parameter `cellSpecificKoffset_r17` is the scheduling offset used for the timing relationships that are modified for NTN (see TS 38.213).
 The unit of the field Koffset is number of slots for a given subcarrier spacing of 15 kHz.
 

doc/analog_beamforming.md

@@ -10,6 +10,8 @@ There are three main beamforming techinques: analog, digital and hybrid. The nam
 
 The presence of a limited number of predefined beams at RU poses constraints to the scheduler at gNB. As a matter of fact, the scheduler can serve only a limited number of beams, depending on the RU characteristics (possibly only 1), in a given time scale, that also depends on the RU characteristics (e.g. 1 slot or 1 symbol). This limitation doesn't exist for digital beamforming.
 
+Analog beamforming implementation also allows to enable distributed antenna systems (DAS), where each beam corrisponds to one antenna (or a set of antennas) of the system. In this scenario, the scheduler constaint is alleviated because normally the number of concurrent beams allowed equals the total number of beams.
+
 # Configuration file fields for analog beamforming
 
 A set of parameters in configuration files controls the implementation of analog beamforming and instructs the scheduler on how to behave in such scenarios. Since most notably this technique in 5G is employed in FR2, the configuration file example currently available is a RFsim one for band 261. [Config file example](../ci-scripts/conf_files/gnb.sa.band261.u3.32prb.rfsim.conf)
@@ -18,8 +20,9 @@ In the `MACRLC` section of configuration files, there are three new parameters:
 - `set_analog_beamforming` can be set to 1 or 0 to activate or desactivate analog beamforming (default value is 0)
 - `beam_duration` is the number of slots (currently minimum duration of a beam) the scheduler is tied to a beam (default value is 1)
 - `beams_per_period` is the number of concurrent beams the RU can handle in the beam duration (default value is 1)
+- `beam_weights` is a vector field containing the set of beam indices to be provided by the OAI L1 to the RU is also required. In current implementation, the number of beam indices should be equal to the number of SSBs transmitted
 
-In the `gNBs` section of the configuration file, under the phyisical parameters, a vector field containing the set of beam indices to be provided by the OAI L1 to the RU is also required. This field is called `beam_weights`. In current implementation, the number of beam indices should be equal to the number of SSBs transmitted.
+DAS is enabled by setting to 1 the parameter `enable_das` in the L1 section of the configuration file. In case of DAS enabled, the field `beam_weights` in `MACRLC` section can be omitted.
 
 # Implementation in OAI scheduler
 
@@ -28,3 +31,28 @@ This matrix contains the beams already allocated in a given slot, to flag the sc
 To this goal, we extended the virtual resource block (VRB) map by one dimension to also contain information per allocated beam. As said, the scheduler can independently schedule users in a number of beams up to `beams_per_period` concurrently.
 
 It is important to note that in current implementation, there are several periodical channels, e.g. PRACH or PUCCH for CSI et cetera, that have the precendence in being assigned a beam, that is because the scheduling is automatic, set in RRC configuration, and not up to the scheduler. For these instances, we assume the beam is available (if not there are assertions to stop the process). For data channels, the currently implemented PF scheduler is used. The only modification is that a UE can be served only if there is a free beam available or the one of the beams already in use correspond to that UE beam.
+
+# FAPI implementation
+
+To be noted that in our implementation analog beamforming is only supported in non-split/monolithic mode because we don't support yet SCF P19 interface that would be needed to manage these procedure in a split scenario with SCF FAPI.
+
+In `config_request` structure, a vendor extension (`nfapi_nr_analog_beamforming_ve_t`) configures the lower layers at initialization with the following information:
+- `analog_bf_vendor_ext` which can assume values 1 or 0 for enabling or disabling analog beamforming
+- `num_beams_period_vendor_ext` which corresponds to the configuration parameter `beams_per_period`
+- `total_num_beams_vendor_ext` which corresponds to the number of beams configured in `beam_weights`
+- `analog_beam_list` which contains the RU beamforming indices configured in `beam_weights`
+
+Additionally, L2 provides in each channel FAPI message information about the beam index. Small Cell Forum (SCF) FAPI provides in its PHY API specifications for the channels only a field for digital beamforming as part of the `precoding_and_beamforming` stucture. Therefore without a better option, we are currently using that one to store the internal analog beamforming index. This is the index used internally by the code to progressively identify the beam with a value from 0 to `total_num_beams_vendor_ext`.
+
+# L1 implementation
+
+To handle multiple concurrent beams, the buffers containing Tx and Rx data in frequency domain (`txdataF` and `rxdataF`) have been extended by one dimension to contain multiple concurrent beams to be transmitted/received.
+The function `beam_index_allocation`, called by every L1 channel, is responsible to match the FAPI analog beam index to the RU beam index and to store the latter `beam_id` structure, which allocates the beams per symbol, despite L2 only supporting beam change at slot level. At the same time, the function returns the concurrent beam index, to be used to store data in frequency domain buffers. While doing so, the function also checks if there is room for current beam in the list of concurrent beams, which should always be the case, if L2 properly allocated the channels.
+
+In case of DAS, since each beam corresponds to a specific antenna port, the `beam_index_allocation` function is simplified in the sense that the beam index corresponds to the antenna port index of the frequency domain buffers.
+
+# RU implementation
+
+The implementation is still work in progress.
+
+The first dimension of the Tx and Rx buffers that used to contain the number of Tx/Rx antennas, it is now extended to contain the number of parallel streams which is the number of antennas multiplied by the number of concurrent beams.

doc/handover-tutorial.md

@@ -54,7 +54,11 @@ Start DU0:
 
     sudo ./nr-softmodem --rfsim -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf --rfsimulator.serveraddr 127.0.0.1
 
-Start the UE, and let it connect completely:
+This will show an error `[HW]   connect() to 127.0.0.1:4043 failed,
+errno(111)`. _This is expected_, because the RFsim server is at the UE (to be
+able to serve two RFsim clients, one DU each; see below for more info). Proceed
+by starting the UE, and let it connect completely (this should make the error
+go away):
 
     sudo ./nr-uesoftmodem -C 3450720000 -r 106 --numerology 1 --ssb 516 -O <config>  --rfsim --rfsimulator.serveraddr server
 
@@ -142,7 +146,7 @@ neighbour relation of the DUs at the CU. To do so, proceed as follows:
    ```
    cat nrRRC_stats.log
    ```
-1. Fill in the `neighbour-config.conf` configuration file as shown below, and
+1. Fill in the [`neighbour-config.conf`](../ci-scripts/conf_files/neighbour-config.conf) configuration file as shown below, and
    `@include` it in the CU file.
 1. Start the CU and both DUs.
 1. Bring the phone close to one cell, and leave flight mode. It should connect
@@ -157,7 +161,7 @@ triggered:
 - Make sure that both DUs use the same hardware.
 - Make sure that the UE sees both cells. For instance, you can switch to flight
   mode, go closer to the other DU, and switch off flight mode -- the UE should
-  connect to that second UE.
+  connect to that second DU.
 - We did not manage handover with every phone yet -- make sure you use one of
   the list provided above.
 
@@ -246,6 +250,15 @@ nr_measurement_configuration = {
   })
 };
 ```
+`@include` this configuration file inside the gNB section of CU file as shown below.
+
+```
+    plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff })});
+
+
+    @include "neighbour-config.conf"
+
+```
 
 # Handovers triggers and NTN
 

docker/Dockerfile.base.ubuntu22

@@ -40,6 +40,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
        #gcc needed for build_oai
        build-essential \
+       ccache \
        psmisc \
        git \
        #use gcc-12 to avoid problems of default gcc-11 in FlexRIC
@@ -52,15 +53,15 @@ RUN apt-get update && \
        flex \
        m4 \
        # python3-pip for conf template generation
-       python3-pip && \
+       python3-pip \
+       wget && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 && \
     pip3 install --ignore-installed pyyaml
 
 # Add "Tini - A tiny but valid init for containers", https://github.com/krallin/tini
 # it will be copied into target containers, to print exit numbers and handle signals properly
 ENV TINI_VERSION=v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
-RUN chmod +x /tini
+RUN wget https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} -O /tini && chmod +x /tini
 
 # In some network environments, GIT proxy is required
 RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"

docker/Dockerfile.build.fhi72.rhel9

@@ -61,7 +61,7 @@ RUN /bin/sh oaienv && \
       --gNB \
       --build-lib 'telnetsrv enbscope uescope nrscope' \
       -t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
-      --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION" &&\
+      --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION" &&\
     # Mainly to see if the sanitize option was perfectly executed
     ldd ran_build/build/nr-softmodem && \
     ldd ran_build/build/liboran_fhlib_5g.so && \
@@ -72,7 +72,6 @@ RUN mkdir -p openair2/E2AP/flexric/build && \
     cd openair2/E2AP/flexric/build && \
     scl enable gcc-toolset-13 "\
     cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-          -DXAPP_MULTILANGUAGE=OFF \
           -DKPM_VERSION=$KPM_VERSION \
           -DE2AP_VERSION=$E2AP_VERSION .. &&\
     ninja && \

docker/Dockerfile.build.fhi72.ubuntu22

@@ -71,7 +71,7 @@ RUN /bin/sh oaienv && \
       --gNB \
       --build-lib "telnetsrv enbscope uescope nrscope" \
       -t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
-      --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
+      --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
       $BUILD_OPTION && \
     # Mainly to see if the sanitize option was perfectly executed
     ldd ran_build/build/nr-softmodem && \
@@ -82,7 +82,6 @@ RUN /bin/sh oaienv && \
 RUN mkdir -p openair2/E2AP/flexric/build && \
     cd openair2/E2AP/flexric/build && \
     cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-          -DXAPP_MULTILANGUAGE=OFF \
           -DKPM_VERSION=$KPM_VERSION \
           -DE2AP_VERSION=$E2AP_VERSION \
           -DCMAKE_C_COMPILER=gcc-12 \

docker/Dockerfile.build.rhel9

@@ -41,8 +41,7 @@ RUN /bin/sh oaienv && \
     scl enable gcc-toolset-13 "\
     CXXFLAGS='-Werror -fstack-protector-strong' CFLAGS='-Werror -fstack-protector-strong' ./build_oai -c --ninja \
       --eNB --gNB --RU --UE --nrUE \
-      --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \
-      -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
+      --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
       --build-lib 'telnetsrv enbscope uescope nrscope' \
       --build-tool-opt -k10 \
       -w USRP -t Ethernet \
@@ -57,7 +56,6 @@ RUN mkdir -p openair2/E2AP/flexric/build && \
     cd openair2/E2AP/flexric/build && \
     scl enable gcc-toolset-13 "\
     cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-          -DXAPP_MULTILANGUAGE=OFF \
           -DKPM_VERSION=$KPM_VERSION \
           -DE2AP_VERSION=$E2AP_VERSION .. &&\
     ninja && \

docker/Dockerfile.build.ubuntu22

@@ -36,14 +36,19 @@ WORKDIR /oai-ran
 COPY . .
 
 # build all targets so final targets can be created afterwards
-RUN /bin/sh oaienv && \
+RUN \
+   # Mount CCache cache direrctory
+   --mount=type=cache,target=/root/.cache/ccache/ \
+   # Mount CPM package cache
+   --mount=type=cache,target=/root/.cache/cpm/ \
+    /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
     ./build_oai -c --ninja \
       --eNB --gNB --RU --UE --nrUE \
       --build-lib "telnetsrv enbscope uescope nrscope" \
       -w USRP -t Ethernet \
-      --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
+      --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
       --noavx512 \
       --build-tool-opt -k10 \
       --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
@@ -54,10 +59,12 @@ RUN /bin/sh oaienv && \
     ldd ran_build/build/*.so
 
 ## Build FlexRIC for SM Models
-RUN mkdir -p openair2/E2AP/flexric/build && \
+RUN \
+    # Mount CCache cache direrctory
+    --mount=type=cache,target=/root/.cache/ccache/ \
+    mkdir -p openair2/E2AP/flexric/build && \
     cd openair2/E2AP/flexric/build && \
     cmake -GNinja -DCMAKE_BUILD_TYPE=Release \
-          -DXAPP_MULTILANGUAGE=OFF \
           -DKPM_VERSION=$KPM_VERSION \
           -DE2AP_VERSION=$E2AP_VERSION \
           -DCMAKE_C_COMPILER=gcc-12 \