Merge remote-tracking branch 'origin/amarisoft-ue-redcap' into integration_2025_w33 (!3573)

Make Amarisoft UE sim a RedCap UE

Change Amarisoft UE configuration and gNB of the AW2S pipeline to
be/handle RedCap UEs.

The UE should only connect if the gNB handles RedCap UEs. In the logs,
we should see

    [MAC]   UE with RNTI 3725 is RedCap

which we check for the first two UEs (one normal UE/absence of this
message, one RedCap UE/presence of this message).

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, }, ],

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
   #Tracing:

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 :

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 @@
 
   <testCase id="102001">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 1</desc>
     <id>amarisoft_ue_1</id>
   </testCase>
 
+  <testCase id="302001">
+    <class>Custom_Command</class>
+    <desc>Verify UE 1 is normal (no RedCap)</desc>
+    <node>avra</node>
+    <command>[ $(docker logs oai-gnb-aw2s | grep -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 0 ]</command>
+  </testCase>
+
   <testCase id="102002">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 2</desc>
     <id>amarisoft_ue_2</id>
   </testCase>
 
+  <testCase id="302002">
+    <class>Custom_Command</class>
+    <desc>Verify UE 2 is RedCap</desc>
+    <node>avra</node>
+    <command>[ $(docker logs oai-gnb-aw2s | grep -m1 -E "UE with RNTI [0-9a-f]{4} is RedCap" | wc -l) -eq 1 ]</command>
+  </testCase>
+
   <testCase id="102003">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 3</desc>
     <id>amarisoft_ue_3</id>
   </testCase>
 
   <testCase id="102004">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 4</desc>
     <id>amarisoft_ue_4</id>
   </testCase>
 
   <testCase id="102005">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 5</desc>
     <id>amarisoft_ue_5</id>
   </testCase>
 
   <testCase id="102006">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 6</desc>
     <id>amarisoft_ue_6</id>
   </testCase>
 
   <testCase id="102007">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 7</desc>
     <id>amarisoft_ue_7</id>
   </testCase>
 
   <testCase id="102008">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 8</desc>
     <id>amarisoft_ue_8</id>
   </testCase>
 
   <testCase id="102009">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 9</desc>
     <id>amarisoft_ue_9</id>
   </testCase>
 
   <testCase id="102010">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 10</desc>
     <id>amarisoft_ue_10</id>
   </testCase>
 
   <testCase id="102011">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 11</desc>
     <id>amarisoft_ue_11</id>
   </testCase>
 
   <testCase id="102012">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 12</desc>
     <id>amarisoft_ue_12</id>
   </testCase>
 
   <testCase id="102013">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 13</desc>
     <id>amarisoft_ue_13</id>
   </testCase>
 
   <testCase id="102014">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach UE 14</desc>
     <id>amarisoft_ue_14</id>
   </testCase>
 
   <testCase id="102015">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 15</desc>
     <id>amarisoft_ue_15</id>
   </testCase>
 
@@ -233,7 +249,7 @@
 
   <testCase id="102016">
     <class>Attach_UE</class>
-    <desc>Attach UE</desc>
+    <desc>Attach (RedCap) UE 16</desc>
     <id>amarisoft_ue_16</id>
   </testCase>
 

ci-scripts/xml_files/sa_cn5g_asue_start.xml

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