<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/14546">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Have only one bts/bsc configured in osmo-bsc and bscnat<br><br>The way our counter reporting works is that each counter group is<br>reported even if the same one exists multiple times. To avoid that<br>change the default config (used by regen_doc.sh) to only configure one<br>bts / bsc.<br><br>Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556<br>Related: OS#1700<br>---<br>M osmo-bsc-master/osmo-bsc.cfg<br>M osmo-nitb-master/bscs.config<br>2 files changed, 0 insertions(+), 194 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/14546/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg</span><br><span>index 7ce9173..71516dd 100644</span><br><span>--- a/osmo-bsc-master/osmo-bsc.cfg</span><br><span>+++ b/osmo-bsc-master/osmo-bsc.cfg</span><br><span>@@ -157,186 +157,6 @@</span><br><span> timeslot 7</span><br><span> phys_chan_config PDCH</span><br><span> hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- type sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- band DCS1800</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity 1</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 2</span><br><span style="color: hsl(0, 100%, 40%);">- dtx uplink force</span><br><span style="color: hsl(0, 100%, 40%);">- dtx downlink</span><br><span style="color: hsl(0, 100%, 40%);">- base_station_id_code 63</span><br><span style="color: hsl(0, 100%, 40%);">- ms max power 15</span><br><span style="color: hsl(0, 100%, 40%);">- cell reselection hysteresis 4</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev access min 0</span><br><span style="color: hsl(0, 100%, 40%);">- radio-link-timeout 32</span><br><span style="color: hsl(0, 100%, 40%);">- channel allocator ascending</span><br><span style="color: hsl(0, 100%, 40%);">- rach tx integer 9</span><br><span style="color: hsl(0, 100%, 40%);">- rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption attach 1</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(0, 100%, 40%);">- early-classmark-sending forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1235 0</span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list mode manual-si5</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 100</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 200</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 10</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 20</span><br><span style="color: hsl(0, 100%, 40%);">- codec-support fr</span><br><span style="color: hsl(0, 100%, 40%);">- gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs 11bit_rach_support_for_egprs 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs routing area 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs network-control-order nc0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell bvci 1235</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer unblocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsei 1235</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-test 30</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 nsvci 1235</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 local udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote ip 192.168.100.239</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 nsvci 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 local udp port 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 remote udp port 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 remote ip 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- no force-combined-si</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 871</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 23</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- bts 2</span><br><span style="color: hsl(0, 100%, 40%);">- type sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- band DCS1800</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity 1</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 1</span><br><span style="color: hsl(0, 100%, 40%);">- dtx uplink force</span><br><span style="color: hsl(0, 100%, 40%);">- dtx downlink</span><br><span style="color: hsl(0, 100%, 40%);">- base_station_id_code 63</span><br><span style="color: hsl(0, 100%, 40%);">- ms max power 15</span><br><span style="color: hsl(0, 100%, 40%);">- cell reselection hysteresis 4</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev access min 0</span><br><span style="color: hsl(0, 100%, 40%);">- radio-link-timeout 32</span><br><span style="color: hsl(0, 100%, 40%);">- channel allocator ascending</span><br><span style="color: hsl(0, 100%, 40%);">- rach tx integer 9</span><br><span style="color: hsl(0, 100%, 40%);">- rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption attach 1</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(0, 100%, 40%);">- early-classmark-sending forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1236 0</span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list mode manual-si5</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 100</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 200</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 10</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 20</span><br><span style="color: hsl(0, 100%, 40%);">- codec-support fr</span><br><span style="color: hsl(0, 100%, 40%);">- gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs 11bit_rach_support_for_egprs 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs routing area 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs network-control-order nc0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell bvci 1236</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer unblocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsei 1236</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-test 30</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 nsvci 1236</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 local udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote ip 192.168.100.239</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 nsvci 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 local udp port 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 remote udp port 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 1 remote ip 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- no force-combined-si</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 871</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 23</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span> msc 0</span><br><span> ip.access rtp-base 4000</span><br><span> no bsc-welcome-text</span><br><span>diff --git a/osmo-nitb-master/bscs.config b/osmo-nitb-master/bscs.config</span><br><span>index 16cfa2b..b6770e8 100644</span><br><span>--- a/osmo-nitb-master/bscs.config</span><br><span>+++ b/osmo-nitb-master/bscs.config</span><br><span>@@ -6,17 +6,3 @@</span><br><span> max-endpoints 32</span><br><span> paging forbidden 0</span><br><span> osmux on</span><br><span style="color: hsl(0, 100%, 40%);">- bsc 1</span><br><span style="color: hsl(0, 100%, 40%);">- token BSC1</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 2</span><br><span style="color: hsl(0, 100%, 40%);">- description bsc</span><br><span style="color: hsl(0, 100%, 40%);">- max-endpoints 32</span><br><span style="color: hsl(0, 100%, 40%);">- paging forbidden 0</span><br><span style="color: hsl(0, 100%, 40%);">- osmux on</span><br><span style="color: hsl(0, 100%, 40%);">- bsc 2</span><br><span style="color: hsl(0, 100%, 40%);">- token BSC2</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 3</span><br><span style="color: hsl(0, 100%, 40%);">- description bsc</span><br><span style="color: hsl(0, 100%, 40%);">- max-endpoints 32</span><br><span style="color: hsl(0, 100%, 40%);">- paging forbidden 0</span><br><span style="color: hsl(0, 100%, 40%);">- osmux on</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/14546">change 14546</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/14546"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556 </div>
<div style="display:none"> Gerrit-Change-Number: 14546 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>