From 8e253e3435536623be02eb026d93db02258340e3 Mon Sep 17 00:00:00 2001
From: Reem Bahsoun <reem.bahsoun@openairinterface.org>
Date: Fri, 28 Mar 2025 13:00:41 +0100
Subject: [PATCH] Modify XML and gnb.conf - Update the N2 and N3 IP addresses
 to match the Grace Hopper's in the gnb.conf. - Remove the test XML file for
 pulling images in the ARM image builder. - Update the Aerial XML file to pull
 ARM images. - Decrease tested throughput (temporarily) due to problems with
 Foxconn RU

---
 .../gnb-vnf.sa.band78.273prb.aerial.conf      |  4 +-
 .../xml_files/container_sa_aerial_quectel.xml |  9 ++--
 .../container_sa_gh_aerial_quectel.xml        | 49 -------------------
 3 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 ci-scripts/xml_files/container_sa_gh_aerial_quectel.xml

diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
index 2d2120b038..be2e0404e3 100644
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -186,8 +186,8 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
index 07c0c095a2..6a3e7f8057 100644
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -52,6 +52,7 @@
                 <desc>Pull Images from Local Registry</desc>
                 <svr_id>0</svr_id>
                 <images>oai-gnb-aerial</images>
+		<tag_prefix>arm_</tag_prefix>
         </testCase>
 
         <testCase id="800813">
@@ -96,8 +97,8 @@
 
         <testCase id="000022">
                 <class>Iperf</class>
-                <desc>iperf (DL/UDP/600M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 600M -t 30 -R</iperf_args>
+                <desc>iperf (DL/UDP/500M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 500M -t 30 -R</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial2</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -106,8 +107,8 @@
 
         <testCase id="000033">
                 <class>Iperf</class>
-                <desc>iperf (UL/UDP/50M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 50M -t 30</iperf_args>
+                <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 40M -t 30</iperf_args>
                 <svr_id>oc-cn5g-20897-aerial2</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
diff --git a/ci-scripts/xml_files/container_sa_gh_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_gh_aerial_quectel.xml
deleted file mode 100644
index ea60cb2b6f..0000000000
--- a/ci-scripts/xml_files/container_sa_gh_aerial_quectel.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
--->
-<testCaseList>
-        <htmlTabRef>TEST-GH-AERIAL-SA</htmlTabRef>
-        <htmlTabName>Gracehopper AERIAL 100 MHz TDD SA</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                111111
-                333333
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <svr_id>0</svr_id>
-                <images>oai-gnb-aerial</images>
-		<tag_prefix>arm_</tag_prefix>
-        </testCase>
-
-        <testCase id="333333">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <svr_id>0</svr_id>
-                <images>oai-gnb-aerial</images>
-        </testCase>
-</testCaseList>
-