diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-11-02 16:57:22 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-11-12 14:21:04 +0000 |
| commit | 3fec854984527c7a60a403d997b947b23468f3f8 (patch) | |
| tree | 4e432f01feaa5c78de8fdfa7b79e081516ac83a5 | |
| parent | 89b555beeba98c486e3438fef9f19c6ffa62e99a (diff) | |
OsmoGSMTester: Update defaults.conf example
Change-Id: If12df88b4088ecec6d6cb20c83a693c019b8af4a
| -rw-r--r-- | OsmoGSMTester/chapters/config.adoc | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/OsmoGSMTester/chapters/config.adoc b/OsmoGSMTester/chapters/config.adoc index 8176b45..3f8cb44 100644 --- a/OsmoGSMTester/chapters/config.adoc +++ b/OsmoGSMTester/chapters/config.adoc @@ -217,31 +217,50 @@ configuration values like the network name, encryption algorithm or timeslot channel combinations are in fact not resources (only the nitb's interface address is). These additional settings may be provided by the scenario configurations, but in case the provided scenarios leave some values unset, -they are taken from this 'defaults.conf'. (A 'scenario.conf' providing a -similar setting always has precedence over the values given in a -'defaults.conf'). - -*TODO* better match this format with 'resources.conf'? +they are taken from this 'defaults.conf'. (A 'scenario.conf' or a +'resources.conf' providing a similar setting always has precedence over the +values given in a 'defaults.conf'). Example of a 'defaults.conf': ---- nitb: net: - mcc: 1 - mnc: 868 - short_name: osmo-gsm-tester - long_name: osmo-gsm-tester + mcc: 901 + mnc: 70 + short_name: osmo-gsm-tester-nitb + long_name: osmo-gsm-tester-nitb + auth_policy: closed + encryption: a5_0 + +bsc: + net: + mcc: 901 + mnc: 70 + short_name: osmo-gsm-tester-msc + long_name: osmo-gsm-tester-msc auth_policy: closed - encryption: a5 0 + encryption: a5_0 + authentication: optional -nitb_bts: +msc: + net: + mcc: 901 + mnc: 70 + short_name: osmo-gsm-tester-msc + long_name: osmo-gsm-tester-msc + auth_policy: closed + encryption: a5_0 + authentication: optional + +bsc_bts: location_area_code: 23 base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts trx_list: - - max_power_red: 22 + - nominal_power: 23 + max_power_red: 0 arfcn: 868 timeslot_list: - phys_chan_config: CCCH+SDCCH4 @@ -253,5 +272,3 @@ nitb_bts: - phys_chan_config: TCH/F_TCH/H_PDCH - phys_chan_config: TCH/F_TCH/H_PDCH ---- - -*TODO*: detailed descriptions |