From f0a28ebc88ea49ddc3621c220960032253fb1af7 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 31 May 2021 18:10:25 +0100 Subject: [PATCH] Rename drb.conf to rb.conf to reflect the now configurable SRBs. --- cmake/modules/SRSRAN_install_configs.sh.in | 2 +- srsenb/CMakeLists.txt | 6 +++--- srsenb/enb.conf.example | 4 ++-- srsenb/hdr/enb.h | 2 +- srsenb/{drb.conf.example => rb.conf.example} | 0 srsenb/src/enb_cfg_parser.cc | 2 +- srsenb/src/main.cc | 6 +++--- srsenb/test/rrc/test_helpers.cc | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) rename srsenb/{drb.conf.example => rb.conf.example} (100%) diff --git a/cmake/modules/SRSRAN_install_configs.sh.in b/cmake/modules/SRSRAN_install_configs.sh.in index aaa642cad..314b25f3b 100755 --- a/cmake/modules/SRSRAN_install_configs.sh.in +++ b/cmake/modules/SRSRAN_install_configs.sh.in @@ -105,7 +105,7 @@ install_file "ue.conf.example" install_file "enb.conf.example" install_file "sib.conf.example" install_file "rr.conf.example" -install_file "drb.conf.example" +install_file "rb.conf.example" install_file "epc.conf.example" install_file "mbms.conf.example" install_file "user_db.csv.example" diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt index 2a65533f0..367e16db5 100644 --- a/srsenb/CMakeLists.txt +++ b/srsenb/CMakeLists.txt @@ -41,6 +41,6 @@ add_subdirectory(test) # Default configuration files ######################################################################## install(FILES enb.conf.example DESTINATION ${DATA_DIR}) -install(FILES drb.conf.example DESTINATION ${DATA_DIR}) -install(FILES rr.conf.example DESTINATION ${DATA_DIR}) -install(FILES sib.conf.example DESTINATION ${DATA_DIR}) \ No newline at end of file +install(FILES rb.conf.example DESTINATION ${DATA_DIR}) +install(FILES rr.conf.example DESTINATION ${DATA_DIR}) +install(FILES sib.conf.example DESTINATION ${DATA_DIR}) diff --git a/srsenb/enb.conf.example b/srsenb/enb.conf.example index f7760089d..f0f004b07 100644 --- a/srsenb/enb.conf.example +++ b/srsenb/enb.conf.example @@ -36,12 +36,12 @@ n_prb = 50 # sib_config: SIB1, SIB2 and SIB3 configuration file # note: when enabling mbms, use the sib.conf.mbsfn configuration file which includes SIB13 # rr_config: Radio Resources configuration file -# drb_config: DRB configuration file +# rb_config: SRB/DRB configuration file ##################################################################### [enb_files] sib_config = sib.conf rr_config = rr.conf -drb_config = drb.conf +rb_config = rb.conf ##################################################################### # RF configuration diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h index e3ccfca0b..1974b3901 100644 --- a/srsenb/hdr/enb.h +++ b/srsenb/hdr/enb.h @@ -62,7 +62,7 @@ struct enb_args_t { struct enb_files_t { std::string sib_config; std::string rr_config; - std::string drb_config; + std::string rb_config; }; struct log_args_t { diff --git a/srsenb/drb.conf.example b/srsenb/rb.conf.example similarity index 100% rename from srsenb/drb.conf.example rename to srsenb/rb.conf.example diff --git a/srsenb/src/enb_cfg_parser.cc b/srsenb/src/enb_cfg_parser.cc index 504322d25..26c820324 100644 --- a/srsenb/src/enb_cfg_parser.cc +++ b/srsenb/src/enb_cfg_parser.cc @@ -1735,7 +1735,7 @@ int parse_drb(all_args_t* args_, rrc_cfg_t* rrc_cfg_) qci.add_field(new field_qci(rrc_cfg_->qci_cfg)); // Run parser with two sections - parser p(args_->enb_files.drb_config); + parser p(args_->enb_files.rb_config); p.add_section(&srb1); p.add_section(&srb2); p.add_section(&qci); diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc index ba9c58477..6bb6aa002 100644 --- a/srsenb/src/main.cc +++ b/srsenb/src/main.cc @@ -83,7 +83,7 @@ void parse_args(all_args_t* args, int argc, char* argv[]) ("enb_files.sib_config", bpo::value(&args->enb_files.sib_config)->default_value("sib.conf"), "SIB configuration files") ("enb_files.rr_config", bpo::value(&args->enb_files.rr_config)->default_value("rr.conf"), "RR configuration files") - ("enb_files.drb_config", bpo::value(&args->enb_files.drb_config)->default_value("drb.conf"), "DRB configuration files") + ("enb_files.rb_config", bpo::value(&args->enb_files.rb_config)->default_value("rb.conf"), "SRB/DRB configuration files") ("rf.dl_earfcn", bpo::value(&args->enb.dl_earfcn)->default_value(0), "Force Downlink EARFCN for single cell") ("rf.srate", bpo::value(&args->rf.srate_hz)->default_value(0.0), "Force Tx and Rx sampling rate in Hz") @@ -436,8 +436,8 @@ void parse_args(all_args_t* args, int argc, char* argv[]) exit(1); } - if (!config_exists(args->enb_files.drb_config, "drb.conf")) { - cout << "Failed to read DRB configuration file " << args->enb_files.drb_config << " - exiting" << endl; + if (!config_exists(args->enb_files.rb_config, "rb.conf")) { + cout << "Failed to read DRB configuration file " << args->enb_files.rb_config << " - exiting" << endl; exit(1); } diff --git a/srsenb/test/rrc/test_helpers.cc b/srsenb/test/rrc/test_helpers.cc index 10b69e6bd..416fcf193 100644 --- a/srsenb/test/rrc/test_helpers.cc +++ b/srsenb/test/rrc/test_helpers.cc @@ -28,7 +28,7 @@ int parse_default_cfg_phy(rrc_cfg_t* rrc_cfg, phy_cfg_t* phy_cfg, srsenb::all_ar *rrc_cfg = {}; args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example"; args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example"; - args.enb_files.drb_config = argparse::repository_dir + "/drb.conf.example"; + args.enb_files.rb_config = argparse::repository_dir + "/rb.conf.example"; srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str()); args.enb.enb_id = 0x19B; @@ -48,7 +48,7 @@ int parse_default_cfg(rrc_cfg_t* rrc_cfg, srsenb::all_args_t& args) *rrc_cfg = {}; args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example"; args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example"; - args.enb_files.drb_config = argparse::repository_dir + "/drb.conf.example"; + args.enb_files.rb_config = argparse::repository_dir + "/rb.conf.example"; srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str()); args.enb.enb_id = 0x19B; @@ -184,4 +184,4 @@ bool is_cell_cfg_equal(const meas_cell_cfg_t& cfg, const cells_to_add_mod_s& cel return cfg.pci == cell.pci and cell.cell_individual_offset.to_number() == (int8_t)round(cfg.q_offset); } -} // namespace srsenb \ No newline at end of file +} // namespace srsenb