From 12a3045bec575bd8f8b113e9f18dadecbc4ee07b Mon Sep 17 00:00:00 2001 From: Dhanuja Elizabeth Thomas <dhanuja.thomas@openairinterface.org> Date: Wed, 14 Jun 2023 16:21:27 +0200 Subject: [PATCH] Config files: make them lowercase Changes for: - phytest-dora config file - rfsim-phytest-dora-106prb - phytest-dora-106prb-usrpn300 - lte-2x2-tm1 - lte-2x2-tm2 - NSA-2x2 - 4g-rfsim-mbms-fembms - 5grfsim-fr2-32prb - nsa-2x2-quectel - 5g-rfsim-24prb - test xml --- ....usrpn310.conf => enb.band38.lte_2x2.100prb.usrpn310.conf} | 0 ...pn310.conf => enb.band38.lte_2x2_tm2.100prb.usrpn310.conf} | 0 ....usrpn310.conf => enb.band38.nsa_2x2.100prb.usrpn310.conf} | 0 ...RB.rfsim.mbms.conf => enb.band7.tm1.25prb.rfsim.mbms.conf} | 0 ....50PRB.usrpb210.conf => enb.band7.tm1.50prb.usrpb210.conf} | 0 ...st-dora.conf => gnb.band261.32prb.rfsim.phytest-dora.conf} | 0 ...st-dora.conf => gnb.band78.106prb.rfsim.phytest-dora.conf} | 0 ...dora.conf => gnb.band78.106prb.usrpn300.phytest-dora.conf} | 0 ...dora.conf => gnb.band78.162prb.usrpn300.phytest-dora.conf} | 0 ...pn310.2x2.conf => gnb.nsa.band78.106prb.usrpn310.2x2.conf} | 0 ...band78.24PRB.rfsim.conf => gnb.sa.band78.24prb.rfsim.conf} | 0 ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml | 4 ++-- ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml | 4 ++-- ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml | 2 +- ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml | 2 +- ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml | 2 +- ci-scripts/xml_files/test_case_list_template.xml | 2 +- .../yaml_files/4g_rfsimulator_fembms/docker-compose.yml | 2 +- ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml | 2 +- .../yaml_files/5g_rfsimulator_24prb/docker-compose.yaml | 2 +- .../yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml | 2 +- .../yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml | 2 +- ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml | 2 +- ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml | 2 +- doc/RUNMODEM.md | 2 +- openair1/SIMULATION/TOOLS/DOC/rtusage.md | 2 +- 28 files changed, 19 insertions(+), 19 deletions(-) rename ci-scripts/conf_files/{enb.band38.lte_2x2.100PRB.usrpn310.conf => enb.band38.lte_2x2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf => enb.band38.lte_2x2_tm2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band38.nsa_2x2.100PRB.usrpn310.conf => enb.band38.nsa_2x2.100prb.usrpn310.conf} (100%) rename ci-scripts/conf_files/{enb.band7.tm1.25PRB.rfsim.mbms.conf => enb.band7.tm1.25prb.rfsim.mbms.conf} (100%) rename ci-scripts/conf_files/{enb.band7.tm1.50PRB.usrpb210.conf => enb.band7.tm1.50prb.usrpb210.conf} (100%) rename ci-scripts/conf_files/{gnb.band261.32PRB.rfsim.phytest-dora.conf => gnb.band261.32prb.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.106PRB.rfsim.phytest-dora.conf => gnb.band78.106prb.rfsim.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.106PRB.usrpn300.phytest-dora.conf => gnb.band78.106prb.usrpn300.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.band78.162PRB.usrpn300.phytest-dora.conf => gnb.band78.162prb.usrpn300.phytest-dora.conf} (100%) rename ci-scripts/conf_files/{gnb.nsa.band78.106PRB.usrpn310.2x2.conf => gnb.nsa.band78.106prb.usrpn310.2x2.conf} (100%) rename ci-scripts/conf_files/{gnb.sa.band78.24PRB.rfsim.conf => gnb.sa.band78.24prb.rfsim.conf} (100%) diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf similarity index 100% rename from ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf rename to ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf b/ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf rename to ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf diff --git a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf rename to ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf diff --git a/ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf similarity index 100% rename from ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf rename to ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf similarity index 100% rename from ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf rename to ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf diff --git a/ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band78.24PRB.rfsim.conf rename to ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml index 5b84f7e43fa..325c5108d94 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml @@ -100,7 +100,7 @@ <testCase id="030000"> <class>Initialize_eNB</class> <desc>Initialize eNB</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> <eNB_instance>0</eNB_instance> <eNB_serverId>0</eNB_serverId> <air_interface>lte</air_interface> @@ -113,7 +113,7 @@ <testCase id="040000"> <class>Initialize_eNB</class> <desc>Initialize gNB</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --T_stdout 2 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> <eNB_instance>1</eNB_instance> <eNB_serverId>1</eNB_serverId> <air_interface>nr</air_interface> diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml index 8e96dea4415..f5f4b1e5495 100644 --- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml +++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml @@ -105,7 +105,7 @@ <testCase id="031000"> <class>Initialize_eNB</class> <desc>Initialize eNB</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/enb.band38.nsa_2x2.100prb.usrpn310.conf --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> <eNB_instance>0</eNB_instance> <eNB_serverId>0</eNB_serverId> <air_interface>lte</air_interface> @@ -118,7 +118,7 @@ <testCase id="041000"> <class>Initialize_eNB</class> <desc>Initialize gNB</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.nsa.band78.106PRB.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf -q --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time,line_num,function</Initialize_eNB_args> <eNB_instance>1</eNB_instance> <eNB_serverId>1</eNB_serverId> <air_interface>nr</air_interface> diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml index 53636de6a17..1c4faaf99fd 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml @@ -33,7 +33,7 @@ <testCase id="090101"> <class>Initialize_eNB</class> <desc>Initialize gNB USRP</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> <air_interface>NR</air_interface> </testCase> diff --git a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml index af48f00d5a7..2122f8651c6 100644 --- a/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml +++ b/ci-scripts/xml_files/gnb_nr_ue_usrp_run_multi_thread.xml @@ -33,7 +33,7 @@ <testCase id="090103"> <class>Initialize_eNB</class> <desc>Initialize gNB USRP (Tx-Write-Threading enabled)</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> <air_interface>NR</air_interface> </testCase> diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml index c98796890f0..83e7d23f048 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml @@ -45,7 +45,7 @@ <testCase id="090101"> <class>Initialize_eNB</class> <desc>Initialize gNB USRP</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> <rt_stats_cfg>datalog_rt_stats.default.yaml</rt_stats_cfg> <air_interface>NR</air_interface> <USRP_IPAddress>192.168.20.2</USRP_IPAddress> diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml index 3d91d55dfa2..31be6e8ac44 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml @@ -45,7 +45,7 @@ <testCase id="190101"> <class>Initialize_eNB</class> <desc>Initialize gNB USRP</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> <rt_stats_cfg>datalog_rt_stats.1x1.60.yaml</rt_stats_cfg> <air_interface>NR</air_interface> <USRP_IPAddress>192.168.20.2</USRP_IPAddress> diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml index 6231f45169c..09dbbd7757d 100644 --- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml +++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml @@ -45,7 +45,7 @@ <testCase id="290101"> <class>Initialize_eNB</class> <desc>Initialize gNB USRP</desc> - <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162PRB.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> <rt_stats_cfg>datalog_rt_stats.60.2x2.yaml</rt_stats_cfg> <air_interface>NR</air_interface> <USRP_IPAddress>192.168.20.2</USRP_IPAddress> diff --git a/ci-scripts/xml_files/test_case_list_template.xml b/ci-scripts/xml_files/test_case_list_template.xml index eecdfe80b9c..fddf8ad0e49 100644 --- a/ci-scripts/xml_files/test_case_list_template.xml +++ b/ci-scripts/xml_files/test_case_list_template.xml @@ -42,7 +42,7 @@ <testCase id="030101"> <class>Initialize_eNB</class> <desc>Initialize eNB (FDD/Band1/5MHz/info)</desc> - <Initialize_eNB_args>-O enb.band7.tm1.50PRB.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> + <Initialize_eNB_args>-O enb.band7.tm1.50prb.usrpb210.conf --log_config.global_log_options level,nocolor,time</Initialize_eNB_args> </testCase> <testCase id="030102"> diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml index f568989f3f6..47e38ba08c7 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml index 5dc9ae1a041..81a85ff2469 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --log_config.global_log_options level,nocolor,time volumes: - - ../../conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 600f34cbc25..a113203d054 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -175,7 +175,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.sa.band78.24PRB.rfsim.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.24prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index 63293cf628c..349b07f2b4a 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band261.32PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band261.32prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml index b3afb48e8d8..3f58340d1b3 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml @@ -11,7 +11,7 @@ services: public_net: ipv4_address: 192.168.71.140 volumes: - - ../../conf_files/gnb.band78.106PRB.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf - rrc.config:/opt/oai-gnb/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml index 9655cca180a..8a7f4693ecb 100644 --- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml @@ -8,7 +8,7 @@ services: TZ: Europe/Paris USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 volumes: - - ../../conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf:/opt/oai-enb/etc/enb.conf network_mode: "host" healthcheck: test: /bin/bash -c "pgrep lte-softmodem" diff --git a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml index 84711b0a3cd..1f54e7e3806 100644 --- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml @@ -8,7 +8,7 @@ services: TZ: Europe/Paris USE_ADDITIONAL_OPTIONS: --usrp-tx-thread-config 1 --thread-pool 0,2,4,6 volumes: - - ../../conf_files/enb.band38.lte_2x2_tm2.100PRB.usrpn310.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf:/opt/oai-enb/etc/enb.conf network_mode: "host" healthcheck: test: /bin/bash -c "pgrep lte-softmodem" diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md index d32758b1a21..e25400a0a67 100644 --- a/doc/RUNMODEM.md +++ b/doc/RUNMODEM.md @@ -61,7 +61,7 @@ This setup requires an EPC, an OAI eNB and gNB, and a COTS Phone. A dedicated pa ### Launch eNB ```bash -sudo ./lte-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +sudo ./lte-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50prb.usrpb210.conf ``` ### Launch gNB diff --git a/openair1/SIMULATION/TOOLS/DOC/rtusage.md b/openair1/SIMULATION/TOOLS/DOC/rtusage.md index 059d02a307d..5e1bd1b1da5 100644 --- a/openair1/SIMULATION/TOOLS/DOC/rtusage.md +++ b/openair1/SIMULATION/TOOLS/DOC/rtusage.md @@ -27,7 +27,7 @@ Several model lists can be defined in the oai configuration file. One, defined b Channel simulation parameters can also be specified on the command line: ```bash -./lte-softmodem -O ../../../ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf --noS1 --rfsim --rfsimulator.options chanmod --rfsimulator.serveraddr enb --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120 +./lte-softmodem -O ../../../ci-scripts/conf_files/enb.band7.tm1.50prb.usrpb210.conf --noS1 --rfsim --rfsimulator.options chanmod --rfsimulator.serveraddr enb --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120 ``` ### Using the telnet server to modify channel simulator parameters The telnet server includes a `channelmod` command which can be used to dynamically modify some channel model parameters. This command is only available when channel simulation is enabled (via `rfsimulator.options chanmod` option when running the rfsimulator. `channelmod` command has its own help: -- GitLab