From 93f5f6580640447599145b88b777babc04981731 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 11 Sep 2025 17:57:20 +0200 Subject: [PATCH 1/5] remove --sa command line option from sa_fhi_7.2_metanoia_2x2_gnb docker compose --- .../yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml index 06273747bf..f08859a516 100644 --- a/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: oai-gnb environment: TZ: Europe/Paris - USE_ADDITIONAL_OPTIONS: --sa --thread-pool 7,8,9,10,11,12 + USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 devices: - /dev/vfio:/dev/vfio/ volumes: From b8683dd351d0c87f42b73c1a2e39bb2d47ad9395 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 11 Sep 2025 18:47:25 +0200 Subject: [PATCH 2/5] check command line for unknown options at gNB --- executables/nr-softmodem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c index d8df770cb8..0bd583662b 100644 --- a/executables/nr-softmodem.c +++ b/executables/nr-softmodem.c @@ -713,6 +713,11 @@ int main( int argc, char **argv ) { // wait for end of program printf("TYPE TO TERMINATE\n"); + // Sleep a while before checking all parameters have been used + // Some are used directly in external threads, asynchronously + sleep(2); + config_check_unknown_cmdlineopt(uniqCfg, CONFIG_CHECKALLSECTIONS); + itti_wait_tasks_end(NULL); printf("Returned from ITTI signal handler\n"); From fd791568ffc072927c84fa94611526b57dc15a4c Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 11 Sep 2025 18:50:00 +0200 Subject: [PATCH 3/5] change RUNMODEM documentation to reflect --sa not being optional anymore --- doc/RUNMODEM.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md index ba2d48be28..6e46a361fe 100644 --- a/doc/RUNMODEM.md +++ b/doc/RUNMODEM.md @@ -85,10 +85,8 @@ The standalone mode is the default mode. Before tag `2024.w45`, the default mode was NSA. Thus, in the past, to run either the gNB or the UE in standalone mode, it was necessary to provide the -`--sa` flag in the command line. This is not necessary anymore; if in doubt, -you can provide `--sa` on the command line. The gNB will ignore this option if -not relevant; the UE might complain that it does not know this option, which -means that standalone is already active. +`--sa` flag in the command line. This is not the case anymore. If provided +the softmodem exits reporting that it does not know this option. The default (SA) mode does the following: - At the gNB: From e99cf956e75e5b56a09696e17ff6ed73130e4eeb Mon Sep 17 00:00:00 2001 From: francescomani Date: Tue, 16 Sep 2025 10:25:04 +0200 Subject: [PATCH 4/5] remove --sa option from newly created handover test --- ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml b/ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml index aaf058a9f7..24a3055701 100644 --- a/ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml +++ b/ci-scripts/yaml_files/5g_sa_f1_b210_ho/docker-compose.yml @@ -7,7 +7,7 @@ services: ulimits: core: -1 # for core dumps environment: - USE_ADDITIONAL_OPTIONS: --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci --sa + USE_ADDITIONAL_OPTIONS: --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,utc_time,line_num,function volumes: - ../../conf_files/gnb-cu.sa.f1.ho.conf:/opt/oai-gnb/etc/gnb.conf @@ -37,7 +37,7 @@ services: core: -1 # for core dumps environment: USE_B2XX: 'yes' - USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=30AD30F --sa + USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=30AD30F --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,utc_time,line_num,function devices: @@ -69,7 +69,7 @@ services: core: -1 # for core dumps environment: USE_B2XX: 'yes' - USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=31F8010 --sa + USE_ADDITIONAL_OPTIONS: --RUs.[0].sdr_addrs serial=31F8010 --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,utc_time,line_num,function devices: From a76f7a8c62cc98a1b14059c73f6563a6877ffd0f Mon Sep 17 00:00:00 2001 From: francescomani Date: Tue, 16 Sep 2025 11:21:04 +0200 Subject: [PATCH 5/5] remove rfsim option from CU in F1 docker --- ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index 18313d0559..94ef3e7868 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -100,7 +100,6 @@ services: - SYS_NICE environment: USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time - --rfsimulator.options chanmod --gNBs.[0].remote_s_address 0.0.0.0 --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.shrmod ci