summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-11-02 16:57:22 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-11-28 17:15:34 +0100
commit6fa619923789a9169a15291047928510ef34d499 (patch)
tree4a690b08794d9362eaeed9cbb5422ef4ce18850f
parent122306cf57b0119df399a27988e63b2bfd603b8b (diff)
OsmoGSMTester: Update defaults.conf example
-rw-r--r--doc/manuals/chapters/config.adoc45
1 files changed, 31 insertions, 14 deletions
diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc
index 8176b45..3f8cb44 100644
--- a/doc/manuals/chapters/config.adoc
+++ b/doc/manuals/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