From c3e7fe47e6ab45a8c708b4c84a02f77f8594f2e3 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 6 Aug 2025 18:37:32 +0200 Subject: [PATCH 1/4] Remove unused Amarisoft CI XML file --- ci-scripts/xml_files/sa_cn5g_asue_start.xml | 47 --------------------- 1 file changed, 47 deletions(-) delete mode 100644 ci-scripts/xml_files/sa_cn5g_asue_start.xml diff --git a/ci-scripts/xml_files/sa_cn5g_asue_start.xml b/ci-scripts/xml_files/sa_cn5g_asue_start.xml deleted file mode 100644 index a9d3a88d5d..0000000000 --- a/ci-scripts/xml_files/sa_cn5g_asue_start.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - cn5g-start-tab - CN5G-Start - log-in - -100000 -000100 - - - - - - Initialize_5GCN - Initialize 5G Core - --type start-mini-as-ue --scenario 1 --capture /tmp/oai-cn5g-v1.5.pcap - - - - Custom_Command - Reboot USRP - asterix - ssh root@172.21.19.14 reboot ; sleep 45 - - - From 08428381d61253b05749eec58d9d51654b81db3d Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 6 Aug 2025 13:44:36 +0200 Subject: [PATCH 2/4] CI AW2S: modify configuration to have RedCap UEs connect --- ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf index 3bfe9ede51..c56f0e51b5 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf @@ -153,6 +153,11 @@ gNBs = ); + RedCap: { + cellBarredRedCap1Rx_r17 = 1; + cellBarredRedCap2Rx_r17 = 1; + intraFreqReselectionRedCap_r17 = 0; + } # ------- SCTP definitions SCTP : From 4a41df2788f2182baf8d8aebd18906ec7311db04 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 6 Aug 2025 13:52:34 +0200 Subject: [PATCH 3/4] Make some Amarisoft UEs RedCap UEs Change the parameters to be redcap (release: 17, redcap: "redcap") on some UEs, and modify the path to the updated configuration. Specifically, make UE 1 normal (no RedCap), UE 2 RedCap, UEs 3&4 normal, UEs 5&6 RedCap, etc. RedCap UEs should now only be able to connect if the gNB is handling Redcap UEs, which is done in the parent commit. --- ci-scripts/as_ue/aw2s-multi-00102-20.cfg | 40 ++++++++++++++---------- ci-scripts/ci_infra.yaml | 2 +- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ci-scripts/as_ue/aw2s-multi-00102-20.cfg b/ci-scripts/as_ue/aw2s-multi-00102-20.cfg index c02a6b357d..5c8872d9ae 100644 --- a/ci-scripts/as_ue/aw2s-multi-00102-20.cfg +++ b/ci-scripts/as_ue/aw2s-multi-00102-20.cfg @@ -46,7 +46,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -61,8 +61,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -76,7 +77,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -91,7 +92,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -106,8 +107,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -121,8 +123,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -136,7 +139,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -151,7 +154,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -166,7 +169,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -181,8 +184,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -196,8 +200,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -211,8 +216,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -226,7 +232,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -241,7 +247,7 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", apn:"oai", attach_pdn_type:"ipv4", @@ -256,8 +262,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], @@ -271,8 +278,9 @@ allow dynamic UE creation from remote API */ "sim_algo":"milenage", "op": "1006020f0a478bf6b699f15c062e42b3", - as_release: 15, + as_release: 17, ue_category: "nr", + redcap: "redcap", apn:"oai", attach_pdn_type:"ipv4", default_nssai: [ { sst: 1, }, ], diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index 804852c937..9d39e9a781 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -147,7 +147,7 @@ ltebox-nepes: amarisoft_ue: Host: amariue - InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz/aw2s-multi-00102-20.cfg & + InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_redcap/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: From 3b573798878839a5ae7ef65a05b8ed1eea880ce8 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 6 Aug 2025 17:12:03 +0200 Subject: [PATCH 4/4] CI AW2S-Amarisoft: verify RedCap'edness of a UE Since the parent commit, UE 1 is normal (no RedCap), UE 2 is RedCap. Verify that the gNB agrees with that and detects the second UE as RedCap by analyzing some logs. The first check is a bit elaborate, but basically is [ $(docker logs | grep XYZ | wc -l) -eq 0 ] ^ ^ ^ ^ ^ 1 2 3 4 5 (1) is the if statement, that compares (4) the number of occurrences (3) of "RedCap" in the (2) docker logs (5) to being equal to Note for all UEs which number, and whether it is RedCap (so this need to be kept in sync with the Amarisoft UE sim configuration file in use!). --- .../xml_files/container_sa_aw2s_asue.xml | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml index 88ab941e31..f6a2bde823 100644 --- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml +++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml @@ -32,7 +32,9 @@ 120000 102000 102001 + 302001 102002 + 302002 102003 102004 102005 @@ -92,91 +94,105 @@ Attach_UE - Attach UE + Attach UE 1 amarisoft_ue_1 + + Custom_Command + Verify UE 1 is normal (no RedCap) + avra + [ $(docker logs oai-gnb-aw2s | grep -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 0 ] + + Attach_UE - Attach UE + Attach (RedCap) UE 2 amarisoft_ue_2 + + Custom_Command + Verify UE 2 is RedCap + avra + [ $(docker logs oai-gnb-aw2s | grep -m1 -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 1 ] + + Attach_UE - Attach UE + Attach UE 3 amarisoft_ue_3 Attach_UE - Attach UE + Attach UE 4 amarisoft_ue_4 Attach_UE - Attach UE + Attach (RedCap) UE 5 amarisoft_ue_5 Attach_UE - Attach UE + Attach (RedCap) UE 6 amarisoft_ue_6 Attach_UE - Attach UE + Attach UE 7 amarisoft_ue_7 Attach_UE - Attach UE + Attach UE 8 amarisoft_ue_8 Attach_UE - Attach UE + Attach UE 9 amarisoft_ue_9 Attach_UE - Attach UE + Attach (RedCap) UE 10 amarisoft_ue_10 Attach_UE - Attach UE + Attach (RedCap) UE 11 amarisoft_ue_11 Attach_UE - Attach UE + Attach (RedCap) UE 12 amarisoft_ue_12 Attach_UE - Attach UE + Attach UE 13 amarisoft_ue_13 Attach_UE - Attach UE + Attach UE 14 amarisoft_ue_14 Attach_UE - Attach UE + Attach (RedCap) UE 15 amarisoft_ue_15 @@ -233,7 +249,7 @@ Attach_UE - Attach UE + Attach (RedCap) UE 16 amarisoft_ue_16