Merge remote-tracking branch 'origin/issue993' into integration_2025_w38 (!3642)

Check command line for unknown options also at gNB
This commit is contained in:
Jaroslava Fiedlerova
2025-09-17 10:16:43 +02:00
5 changed files with 11 additions and 9 deletions
@@ -100,7 +100,6 @@ services:
- SYS_NICE - SYS_NICE
environment: environment:
USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
--rfsimulator.options chanmod
--gNBs.[0].remote_s_address 0.0.0.0 --gNBs.[0].remote_s_address 0.0.0.0
--telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv --telnetsrv.listenaddr 192.168.71.150
--telnetsrv.shrmod ci --telnetsrv.shrmod ci
@@ -7,7 +7,7 @@ services:
ulimits: ulimits:
core: -1 # for core dumps core: -1 # for core dumps
environment: 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 --log_config.global_log_options level,nocolor,utc_time,line_num,function
volumes: volumes:
- ../../conf_files/gnb-cu.sa.f1.ho.conf:/opt/oai-gnb/etc/gnb.conf - ../../conf_files/gnb-cu.sa.f1.ho.conf:/opt/oai-gnb/etc/gnb.conf
@@ -37,7 +37,7 @@ services:
core: -1 # for core dumps core: -1 # for core dumps
environment: environment:
USE_B2XX: 'yes' 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 --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
--log_config.global_log_options level,nocolor,utc_time,line_num,function --log_config.global_log_options level,nocolor,utc_time,line_num,function
devices: devices:
@@ -69,7 +69,7 @@ services:
core: -1 # for core dumps core: -1 # for core dumps
environment: environment:
USE_B2XX: 'yes' 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 --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
--log_config.global_log_options level,nocolor,utc_time,line_num,function --log_config.global_log_options level,nocolor,utc_time,line_num,function
devices: devices:
@@ -9,7 +9,7 @@ services:
container_name: oai-gnb container_name: oai-gnb
environment: environment:
TZ: Europe/Paris 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: devices:
- /dev/vfio:/dev/vfio/ - /dev/vfio:/dev/vfio/
volumes: volumes:
+2 -4
View File
@@ -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 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 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, `--sa` flag in the command line. This is not the case anymore. If provided
you can provide `--sa` on the command line. The gNB will ignore this option if the softmodem exits reporting that it does not know this option.
not relevant; the UE might complain that it does not know this option, which
means that standalone is already active.
The default (SA) mode does the following: The default (SA) mode does the following:
- At the gNB: - At the gNB:
+5
View File
@@ -713,6 +713,11 @@ int main( int argc, char **argv ) {
// wait for end of program // wait for end of program
printf("TYPE <CTRL-C> TO TERMINATE\n"); printf("TYPE <CTRL-C> 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); itti_wait_tasks_end(NULL);
printf("Returned from ITTI signal handler\n"); printf("Returned from ITTI signal handler\n");