OsmoGSMTester: Update defaults.conf example

Change-Id: If12df88b4088ecec6d6cb20c83a693c019b8af4a

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
+they are taken from this 'defaults.conf'. (A 'scenario.conf' or a
-similar setting always has precedence over the values given in a
+'resources.conf' providing a similar setting always has precedence over the
-'defaults.conf').
+values given in a 'defaults.conf').
-
-*TODO* better match this format with 'resources.conf'?
 
 Example of a 'defaults.conf':
 
 ----
 nitb:
   net:
-    mcc: 1
+    mcc: 901
-    mnc: 868
+    mnc: 70
-    short_name: osmo-gsm-tester
+    short_name: osmo-gsm-tester-nitb
-    long_name: osmo-gsm-tester
+    long_name: osmo-gsm-tester-nitb
     auth_policy: closed
-    encryption: a5 0
+    encryption: a5_0
 
-nitb_bts:
+bsc:
+  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
+
+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