From bbfd3c6174a9f03d2f7a1dea44e62a02f6596621 Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Fri, 22 Nov 2024 16:13:26 +0100
Subject: [PATCH] CI: use OC CN in aerial pipeline

Replace current docker deployment of OAI CN by deployment on OC. With change
of the CN, we also need to change the routing for UE module - change the
mbim script for controling the UE.
---
 ci-scripts/ci_infra.yaml                      | 11 ++++++++--
 .../gnb-vnf.sa.band78.273prb.aerial.conf      |  2 +-
 .../xml_files/container_sa_aerial_quectel.xml | 21 +++++++++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index cf6e0cad11..d651f2723c 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -28,8 +28,8 @@ up2-fhi72:
 
 up2-aerial:
   Host: up2
-  AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh
+  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
+  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
   NetworkScript: ip a show dev wwan0
   IF: wwan0
   MTU: 1500
@@ -75,6 +75,13 @@ oc-cn5g-20897:
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
 
+oc-cn5g-20897-aerial2:
+  Host: aerial2
+  Namespace: "oaicicd-core-for-fhi72"
+  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  NetworkScript: echo "inet 172.21.6.105"
+  RunIperf3Server: False
+
 matix-cn5g:
   Host: matix
   NetworkScript: docker exec prod-trf-gen ip a show dev eth0
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 c035882d36..a38355ecea 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
@@ -188,7 +188,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
 
 
     NETWORK_INTERFACES :
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
index 63f22af51d..1b56111dd6 100644
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -25,6 +25,7 @@
         <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
         <htmlTabIcon>tasks</htmlTabIcon>
         <TestCaseRequestedList>
+                555000
                 111111
                 000222
                 800813
@@ -37,8 +38,14 @@
                 000222
                 222222
                 333333
+                000555
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="555000">
+                <class>Initialize_5GCN</class>
+                <desc>Initialize 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial2</cn_id>
+        </testCase>
 
         <testCase id="111111">
                 <class>Pull_Local_Registry</class>
@@ -82,15 +89,15 @@
                 <class>Ping</class>
                 <desc>Ping: 100pings in 20sec</desc>
                 <id>up2-aerial</id>
-                <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
+                <ping_args>-c 100 -i 0.2 172.21.6.104</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="000022">
                 <class>Iperf</class>
-                <desc>iperf (DL/UDP/700M)(30 sec)(single-ue profile)</desc>
+                <desc>iperf (DL/UDP/600M)(30 sec)(single-ue profile)</desc>
                 <iperf_args>-u -b 600M -t 30 -R</iperf_args>
-                <svr_id>porcepix-cn5g</svr_id>
+                <svr_id>oc-cn5g-20897-aerial2</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -100,7 +107,7 @@
                 <class>Iperf</class>
                 <desc>iperf (UL/UDP/50M)(30 sec)(single-ue profile)</desc>
                 <iperf_args>-u -b 50M -t 30</iperf_args>
-                <svr_id>porcepix-cn5g</svr_id>
+                <svr_id>oc-cn5g-20897-aerial2</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -131,5 +138,11 @@
                 <test_svr_id>0</test_svr_id>
         </testCase>
 
+        <testCase id="000555">
+                <class>Terminate_5GCN</class>
+                <always_exec>true</always_exec>
+                <desc>Terminate 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial2</cn_id>
+        </testCase>
 </testCaseList>