Skip to content
Snippets Groups Projects
Commit 288003b4 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

feat(ci): make all NFs logging on error-level only 


Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 126b60bb
No related branches found
No related tags found
1 merge request!104Test: Load test --> putting all NF in error log-level
Hide whitespace changes
Inline Side-by-side
ci-scripts/Jenkinsfile-GitLab-Load-Check
+ 9
− 7
View file @ 288003b4
......@@ -203,9 +203,8 @@ pipeline {
stage ('Deploy OAI-CN5G in Basic-NRF variant - Registration Test') {
steps {
script {
// Silent the AMF container
echo 'Silencing the AMF to reduce size of logs'
sh './ci-scripts/silentCN5G-NF.py --docker-compose-file docker-compose/docker-compose-basic-nrf.yaml --amf-silent'
echo 'Silencing all NFs to reduce size of logs'
sh './ci-scripts/silentCN5G-NF.py --docker-compose-file docker-compose/docker-compose-basic-nrf.yaml --all-log-level error'
updateDockerCompose('docker-compose/docker-compose-basic-nrf.yaml', gnbsimTag)
dir ('docker-compose') {
echo 'Adding 16000 Users to database'
......@@ -298,6 +297,8 @@ pipeline {
stage ('Deploy OAI-CN5G in Basic-NRF variant - PDU Sess Est Test') {
steps {
script {
echo 'Silencing all NFs to reduce size of logs'
sh './ci-scripts/silentCN5G-NF.py --docker-compose-file docker-compose/docker-compose-basic-nrf.yaml --all-log-level error'
updateDockerCompose('docker-compose/docker-compose-basic-nrf.yaml', gnbsimTag)
dir ('docker-compose') {
echo 'Adding 16000 Users to database'
......@@ -334,7 +335,7 @@ pipeline {
}
}
}
// PDU Session Establishment Test may fail
// PDU Session Establishment Test should not fail
stage ('PDU Session Establishment Test') {
steps {
script {
......@@ -390,6 +391,8 @@ pipeline {
stage ('Deploy OAI-CN5G in Basic-NRF - PDU Sess Est Test - HTTP2') {
steps {
script {
echo 'Silencing all NFs to reduce size of logs'
sh './ci-scripts/silentCN5G-NF.py --docker-compose-file docker-compose/docker-compose-basic-nrf.yaml --all-log-level error'
updateDockerCompose('docker-compose/docker-compose-basic-nrf-http2.yaml', gnbsimTag)
dir ('docker-compose') {
echo 'Adding 16000 Users to database'
......@@ -426,7 +429,7 @@ pipeline {
}
}
}
// PDU Session Establishment Test may fail
// PDU Session Establishment Test should not fail
stage ('PDU Session Establishment Test - HTTP2') {
steps {
script {
......@@ -434,8 +437,7 @@ pipeline {
sh 'sed -i -e "s@TEST_REGISTER@False@" -e "s@NB_REGISTRATIONS@10@" omec-gnbsim-config-*.yaml'
sh 'sed -i -e "s@TEST_PDU_SESSION@True@" -e "s@NB_PDU_SESSIONS@5@" omec-gnbsim-config-*.yaml'
sh 'docker-compose -f docker-compose-omec-gnbsim.yaml up -d'
// Test should fail in less than 60 seconds
sh '../../checkOmecGnbsimStatus.py --timeout 120 || true'
sh '../../checkOmecGnbsimStatus.py --timeout 120'
}
retrieveGnbsimLogs('archives/pdu-sess-est-test-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
dir ('ci-scripts/docker-compose/load-test-gnbsim') {
......
ci-scripts/silentCN5G-NF.py
+ 209
− 3
View file @ 288003b4
......@@ -41,6 +41,7 @@ def _parse_args() -> argparse.Namespace:
"""
example_text = '''example:
./ci-scripts/silentCN5G-NF.py --help
./ci-scripts/silentCN5G-NF.py --docker-compose-file DC_FILENAME --amf-log-level error
./ci-scripts/silentCN5G-NF.py --docker-compose-file DC_FILENAME --amf-silent'''
parser = argparse.ArgumentParser(description='OAI 5G CORE NETWORK Utility tool',
......@@ -53,17 +54,170 @@ def _parse_args() -> argparse.Namespace:
help='Docker-compose File to modify',
)
# ALL NF arguments
parser.add_argument(
'--all-silent',
action='store_true',
default=False,
help='Make all NFs silent',
)
parser.add_argument(
'--all-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set all NFs to the same log level',
)
# AMF arguments
parser.add_argument(
'--amf-silent',
action='store_true',
default=False,
help='Make AMF NF silent',
)
parser.add_argument(
'--amf-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set AMF log level',
)
# SMF arguments
parser.add_argument(
'--smf-silent',
action='store_true',
default=False,
help='Make SMF NF silent',
)
parser.add_argument(
'--smf-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set SMF log level',
)
# NRF arguments
parser.add_argument(
'--nrf-silent',
action='store_true',
default=False,
help='Make NRF NF silent',
)
parser.add_argument(
'--nrf-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set NRF log level',
)
# SPGWU arguments
parser.add_argument(
'--spgwu-silent',
action='store_true',
default=False,
help='Make SPGWU NF silent',
)
parser.add_argument(
'--spgwu-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set SPGWU log level',
)
# AUSF arguments
parser.add_argument(
'--ausf-silent',
action='store_true',
default=False,
help='Make AUSF NF silent',
)
parser.add_argument(
'--ausf-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set AUSF log level',
)
# UDM arguments
parser.add_argument(
'--udm-silent',
action='store_true',
default=False,
help='Make UDM NF silent',
)
parser.add_argument(
'--udm-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set UDM log level',
)
# UDR arguments
parser.add_argument(
'--udr-silent',
action='store_true',
default=False,
help='Make UDR NF silent',
)
parser.add_argument(
'--udr-log-level',
action='store',
default='',
choices = ["info", "error", "warning"],
help='Set UDR log level',
)
return parser.parse_args()
if __name__ == '__main__':
# Parse the arguments
args = _parse_args()
# Finalize arguments
if args.amf_silent:
args.amf_log_level = 'off'
if args.smf_silent:
args.smf_log_level = 'off'
if args.nrf_silent:
args.nrf_log_level = 'off'
if args.spgwu_silent:
args.spgwu_log_level = 'off'
if args.ausf_silent:
args.ausf_log_level = 'off'
if args.udm_silent:
args.udm_log_level = 'off'
if args.udr_silent:
args.udr_log_level = 'off'
if args.all_silent:
args.amf_log_level = 'off'
args.smf_log_level = 'off'
args.nrf_log_level = 'off'
args.spgwu_log_level = 'off'
args.ausf_log_level = 'off'
args.udm_log_level = 'off'
args.udr_log_level = 'off'
if args.all_log_level != '':
args.amf_log_level = args.all_log_level
args.smf_log_level = args.all_log_level
args.nrf_log_level = args.all_log_level
args.spgwu_log_level = args.all_log_level
args.ausf_log_level = args.all_log_level
args.udm_log_level = args.all_log_level
args.udr_log_level = args.all_log_level
cwd = os.getcwd()
if not os.path.isfile(os.path.join(cwd, args.docker_compose_file)):
......@@ -71,13 +225,65 @@ if __name__ == '__main__':
sys.exit(-1)
lines = ''
amfContainerFound = False
smfContainerFound = False
nrfContainerFound = False
spgwuContainerFound = False
ausfContainerFound = False
udmContainerFound = False
udrContainerFound = False
with open(os.path.join(cwd, args.docker_compose_file), 'r') as rfile:
for line in rfile:
lines += line
if re.search('image: oaisoftwarealliance/oai-amf:', line) is not None and args.amf_silent:
newLine = re.sub('image:', 'command:', line)
newLine = re.sub('oaisoftwarealliance.*$', '["/openair-amf/bin/oai_amf", "-c", "/openair-amf/etc/amf.conf"]', newLine)
# amf
if re.search('image: oaisoftwarealliance/oai-amf:', line) is not None and args.amf_log_level != '':
amfContainerFound = True
if re.search('TZ=Europe', line) is not None and amfContainerFound and args.amf_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.amf_log_level}', line)
lines += newLine
amfContainerFound = False
# smf
if re.search('image: oaisoftwarealliance/oai-smf:', line) is not None and args.smf_log_level != '':
smfContainerFound = True
if re.search('TZ=Europe', line) is not None and smfContainerFound and args.smf_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.smf_log_level}', line)
lines += newLine
smfContainerFound = False
# nrf
if re.search('image: oaisoftwarealliance/oai-nrf:', line) is not None and args.nrf_log_level != '':
nrfContainerFound = True
if re.search('TZ=Europe', line) is not None and nrfContainerFound and args.nrf_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.nrf_log_level}', line)
lines += newLine
nrfContainerFound = False
# spgwu
if re.search('image: oaisoftwarealliance/oai-spgwu-tiny:', line) is not None and args.spgwu_log_level != '':
spgwuContainerFound = True
if re.search('TZ=Europe', line) is not None and spgwuContainerFound and args.spgwu_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.spgwu_log_level}', line)
lines += newLine
spgwuContainerFound = False
# ausf
if re.search('image: oaisoftwarealliance/oai-ausf:', line) is not None and args.ausf_log_level != '':
ausfContainerFound = True
if re.search('TZ=Europe', line) is not None and ausfContainerFound and args.ausf_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.ausf_log_level}', line)
lines += newLine
ausfContainerFound = False
# udm
if re.search('image: oaisoftwarealliance/oai-udm:', line) is not None and args.udm_log_level != '':
udmContainerFound = True
if re.search('TZ=Europe', line) is not None and udmContainerFound and args.udm_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.udm_log_level}', line)
lines += newLine
udmContainerFound = False
# udr
if re.search('image: oaisoftwarealliance/oai-udr:', line) is not None and args.udr_log_level != '':
udrContainerFound = True
if re.search('TZ=Europe', line) is not None and udrContainerFound and args.udr_log_level != '':
newLine = re.sub('TZ=Europe.*$', f'LOG_LEVEL={args.udr_log_level}', line)
lines += newLine
udrContainerFound = False
with open(os.path.join(cwd, args.docker_compose_file), 'w') as wfile:
wfile.write(lines)
......
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