Skip to content

O
openairinterface-6g
Commit 6a6588e9 authored by Teodora's avatar Teodora Committed by Robert Schmidt
Browse files
Options

OAI-FLEXRIC-RAN-Integration-Test CI pipeline 

1. Rename oai-flexric to nearRT-RIC. FlexRIC is a project combining nearRT-RIC, xApps, and E2 agent emulators.
2. Instead of undeploying all the containers at the same time, and not checking the logs for xApps and nearRT-RIC, do the following:
- Stop containers (docker compose stop) - one or subgroup of running containers in the following order:
   a) xapp-kpm-moni
   b) xapp-kpm-rc
   c) xapp-gtp-mac-rlc-pdcp-moni
   d) oai-nr-ue oai-nr-ue2
   e) oai-gnb
   f) nearRT-RIC
- Undeploy containers (docker compose down), collect and analyze all the logs.
parent 81680e29
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 15 deletions
ci-scripts/cls_containerize.py
View file @ 6a6588e9
...@@ -47,6 +47,7 @@ import helpreadme as HELP ...@@ -47,6 +47,7 @@ import helpreadme as HELP
import constants as CONST import constants as CONST
import cls_oaicitest import cls_oaicitest
from cls_ci_helper import archiveArtifact from cls_ci_helper import archiveArtifact
from collections import deque
#----------------------------------------------------------- #-----------------------------------------------------------
# Helper functions used here and in other classes # Helper functions used here and in other classes
...@@ -216,6 +217,24 @@ def CheckLogs(self, filename, HTML, RAN): ...@@ -216,6 +217,24 @@ def CheckLogs(self, filename, HTML, RAN):
else: else:
HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg]) HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
HTML.htmleNBFailureMsg = "" HTML.htmleNBFailureMsg = ""
elif 'xapp' in name:
opt = f"Undeploy {name}"
with open(f'{filename}', "r") as f:
last_line = deque(f, maxlen=1).pop()
if ('Test xApp run SUCCESSFULLY' in last_line):
HTML.CreateHtmlTestRowQueue(opt, 'OK', ["xApp run successfully"])
else:
HTML.CreateHtmlTestRowQueue(opt, 'KO', ["xApp didn't run successfully"])
success = False
elif 'RIC' in name:
opt = f"Undeploy {name}"
with open(f'{filename}', 'r') as f:
last_line = deque(f, maxlen=1).pop()
if ('Removing E2 Node' in last_line):
HTML.CreateHtmlTestRowQueue(opt, 'OK', ["nearRT-RIC run successfully"])
else:
HTML.CreateHtmlTestRowQueue(opt, 'KO', ["nearRT-RIC didn't run successfully"])
success = False
else: else:
logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE") logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
logging.debug(f"log check: file {filename} passed analysis {success}") logging.debug(f"log check: file {filename} passed analysis {success}")
......
ci-scripts/xml_files/container_5g_flexric_rfsim.xml
View file @ 6a6588e9
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
002006 002006
444444 444444
100002 100002
100003
100004
100005
100006
100007
100008
100009
100001 100001
222221 222221
222222 222222
...@@ -95,10 +102,10 @@ ...@@ -95,10 +102,10 @@
<testCase id="000002"> <testCase id="000002">
<class>Deploy_Object</class> <class>Deploy_Object</class>
<desc>Deploy OAI FlexRIC</desc> <desc>Deploy OAI nearRT-RIC</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>oai-flexric</services> <services>nearRT-RIC</services>
</testCase> </testCase>
<testCase id="000003"> <testCase id="000003">
...@@ -151,16 +158,72 @@ ...@@ -151,16 +158,72 @@
</testCase> </testCase>
<testCase id="100002"> <testCase id="100002">
<class>Stop_Object</class>
<desc>Stop RC monitoring xApp</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-rc-moni</services>
</testCase>
<testCase id="100003">
<class>Stop_Object</class>
<desc>Stop KPM monitoring xApp</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-kpm-moni</services>
</testCase>
<testCase id="100004">
<class>Stop_Object</class>
<desc>Stop KPM monitoring and RC control xApp</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-kpm-rc</services>
</testCase>
<testCase id="100005">
<class>Stop_Object</class>
<desc>Stop custom SMs monitoring xApp</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-gtp-mac-rlc-pdcp-moni</services>
</testCase>
<testCase id="100006">
<class>Stop_Object</class>
<desc>Stop OAI UEs</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>oai-nr-ue oai-nr-ue2</services>
</testCase>
<testCase id="100007">
<class>Stop_Object</class>
<desc>Stop OAI gNB</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>oai-gnb</services>
</testCase>
<testCase id="100008">
<class>Stop_Object</class>
<desc>Stop nearRT-RIC</desc>
<node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>nearRT-RIC</services>
</testCase>
<testCase id="100009">
<class>Undeploy_Object</class> <class>Undeploy_Object</class>
<desc>Undeploy RAN and Flexric</desc> <desc>Undeploy RAN and FlexRIC</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<always_exec>true</always_exec> <always_exec>true</always_exec>
</testCase> </testCase>
<testCase id="010000"> <testCase id="010000">
<class>Deploy_Object</class> <class>Deploy_Object</class>
<desc>RC monitoring</desc> <desc>Deploy RC monitoring</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-rc-moni</services> <services>xapp-rc-moni</services>
...@@ -168,7 +231,7 @@ ...@@ -168,7 +231,7 @@
<testCase id="010001"> <testCase id="010001">
<class>Deploy_Object</class> <class>Deploy_Object</class>
<desc>KPM monitoring</desc> <desc>Deploy KPM monitoring</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-kpm-moni</services> <services>xapp-kpm-moni</services>
...@@ -176,7 +239,7 @@ ...@@ -176,7 +239,7 @@
<testCase id="010002"> <testCase id="010002">
<class>Deploy_Object</class> <class>Deploy_Object</class>
<desc>KPM monitoring and RC control</desc> <desc>Deploy KPM monitoring and RC control</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-kpm-rc</services> <services>xapp-kpm-rc</services>
...@@ -184,7 +247,7 @@ ...@@ -184,7 +247,7 @@
<testCase id="010003"> <testCase id="010003">
<class>Deploy_Object</class> <class>Deploy_Object</class>
<desc>Custom SMs monitoring</desc> <desc>Deploy custom SMs monitoring</desc>
<node>localhost</node> <node>localhost</node>
<yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path> <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
<services>xapp-gtp-mac-rlc-pdcp-moni</services> <services>xapp-gtp-mac-rlc-pdcp-moni</services>
......
ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml
View file @ 6a6588e9
services: services:
oai-flexric: nearRT-RIC:
image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop} image: ${REGISTRY-oaisoftwarealliance/}oai-flexric:${FLEXRIC_TAG:-develop}
container_name: oai-flexric container_name: nearRT-RIC
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.150 ipv4_address: 192.168.70.150
...@@ -17,7 +17,7 @@ services: ...@@ -17,7 +17,7 @@ services:
command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni" command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_rc_moni"
container_name: xapp-rc-moni container_name: xapp-rc-moni
depends_on: depends_on:
- oai-flexric - nearRT-RIC
- oai-gnb - oai-gnb
networks: networks:
public_net: public_net:
...@@ -34,7 +34,7 @@ services: ...@@ -34,7 +34,7 @@ services:
command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni" command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_kpm_moni"
container_name: xapp-kpm-moni container_name: xapp-kpm-moni
depends_on: depends_on:
- oai-flexric - nearRT-RIC
- oai-gnb - oai-gnb
networks: networks:
public_net: public_net:
...@@ -51,7 +51,7 @@ services: ...@@ -51,7 +51,7 @@ services:
command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc" command: "stdbuf -o0 /usr/local/flexric/xApp/c/kpm_rc/xapp_kpm_rc"
container_name: xapp-kpm-rc container_name: xapp-kpm-rc
depends_on: depends_on:
- oai-flexric - nearRT-RIC
- oai-gnb - oai-gnb
networks: networks:
public_net: public_net:
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,7 @@ services:
command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni" command: "stdbuf -o0 /usr/local/flexric/xApp/c/monitor/xapp_gtp_mac_rlc_pdcp_moni"
container_name: xapp-gtp-mac-rlc-pdcp-moni container_name: xapp-gtp-mac-rlc-pdcp-moni
depends_on: depends_on:
- oai-flexric - nearRT-RIC
- oai-gnb - oai-gnb
networks: networks:
public_net: public_net:
...@@ -88,7 +88,7 @@ services: ...@@ -88,7 +88,7 @@ services:
USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-flexric - nearRT-RIC
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.151 ipv4_address: 192.168.70.151
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment