From 498d2f8b374ca791fed2e14888d71320157bab68 Mon Sep 17 00:00:00 2001
From: Teodora <teodora.vladic@openairinterface.org>
Date: Fri, 2 May 2025 01:18:19 +0200
Subject: [PATCH] Improve OAI-FlexRIC CI pipeline

Instead of running xApps from oai-flexric container,
create dedicated xApp containers.

In addition, modify the flexric.conf: DB_PATH doesn't exist;
DB_DIR is the correct name.
---
 .../xml_files/container_5g_flexric_rfsim.xml  | 36 +++++-----
 .../5g_rfsimulator_flexric/conf/flexric.conf  |  4 +-
 .../5g_rfsimulator_flexric/docker-compose.yml | 68 +++++++++++++++++++
 3 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
index 05e050ab64..a56248fe0e 100644
--- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
@@ -165,35 +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>
+                <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>
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_flexric/conf/flexric.conf b/ci-scripts/yaml_files/5g_rfsimulator_flexric/conf/flexric.conf
index 5ffbf3d47f..481c4e68f9 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_flexric/conf/flexric.conf
+++ b/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/
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml b/ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml
index 9afdd02b60..899e02295f 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml
@@ -13,6 +13,74 @@ services:
             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