<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18944">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Sync osmo-{bsc,stp}.cfg with docker-playground.git<br><br>It appears some changes were made only to the files in<br>docker-playground.git, but not here. This means that running<br>tests locally produced unexpected results.<br><br>We must always ensure that the tests run both without and with<br>docker, which means making sure the configs are all maintained!<br><br>Change-Id: I3a3f4c572b8a390882fb8f12807018ca19e4827c<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/osmo-bsc.cfg<br>M bsc/osmo-stp.cfg<br>3 files changed, 66 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 7398612..84f8eaf 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -131,7 +131,7 @@</span><br><span> peer_pc := 187, /* 0.23.3 osmo-bsc */</span><br><span> peer_ssn := 254,</span><br><span> sio := '83'O,</span><br><span style="color: hsl(0, 100%, 40%);">- rctx := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ rctx := 1</span><br><span> },</span><br><span> {</span><br><span> transport := BSSAP_TRANSPORT_AoIP,</span><br><span>diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg</span><br><span>index 6e80e83..a4c767a 100644</span><br><span>--- a/bsc/osmo-bsc.cfg</span><br><span>+++ b/bsc/osmo-bsc.cfg</span><br><span>@@ -6,10 +6,11 @@</span><br><span> log stderr</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging timestamp 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level all everything</span><br><span> logging level rll notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level cc notice</span><br><span> logging level mm notice</span><br><span> logging level rr notice</span><br><span> logging level rsl notice</span><br><span>@@ -17,10 +18,8 @@</span><br><span> logging level pag notice</span><br><span> logging level meas notice</span><br><span> logging level msc notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level mgcp notice</span><br><span> logging level ho notice</span><br><span> logging level ref notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level nat notice</span><br><span> logging level ctrl notice</span><br><span> logging level filter debug</span><br><span> logging level pcu debug</span><br><span>@@ -46,11 +45,19 @@</span><br><span> !</span><br><span> line vty</span><br><span> no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 127.0.0.1</span><br><span> !</span><br><span> e1_input</span><br><span> e1_line 0 driver ipa</span><br><span> e1_line 0 port 0</span><br><span> no e1_line 0 keepalive</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-msc-0 2905 1905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp-address msc2</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code 0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp-address msc3</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code 0.0.3</span><br><span> network</span><br><span> network country code 1</span><br><span> mobile network code 1</span><br><span>@@ -64,9 +71,8 @@</span><br><span> handover power budget interval 6</span><br><span> handover power budget hysteresis 3</span><br><span> handover maximum distance 9999</span><br><span style="color: hsl(0, 100%, 40%);">- dyn_ts_allow_tch_f 1</span><br><span style="color: hsl(0, 100%, 40%);">- periodic location update 30</span><br><span> timer t3113 10</span><br><span style="color: hsl(120, 100%, 40%);">+ timer t3212 30</span><br><span> bts 0</span><br><span> type sysmobts</span><br><span> band DCS1800</span><br><span>@@ -95,7 +101,6 @@</span><br><span> si5 neighbor-list add arfcn 20</span><br><span> codec-support fr hr efr amr</span><br><span> gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs 11bit_rach_support_for_egprs 0</span><br><span> gprs routing area 0</span><br><span> gprs network-control-order nc0</span><br><span> gprs cell bvci 1234</span><br><span>@@ -127,6 +132,7 @@</span><br><span> gprs nsvc 1 remote udp port 0</span><br><span> gprs nsvc 1 remote ip 0.0.0.0</span><br><span> no force-combined-si</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 871</span><br><span>@@ -134,7 +140,7 @@</span><br><span> max_power_red 20</span><br><span> rsl e1 tei 0</span><br><span> timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4+CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -185,7 +191,6 @@</span><br><span> si5 neighbor-list add arfcn 20</span><br><span> codec-support fr hr efr amr</span><br><span> gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs 11bit_rach_support_for_egprs 0</span><br><span> gprs routing area 0</span><br><span> gprs network-control-order nc0</span><br><span> gprs cell bvci 1235</span><br><span>@@ -217,6 +222,7 @@</span><br><span> gprs nsvc 1 remote udp port 0</span><br><span> gprs nsvc 1 remote ip 0.0.0.0</span><br><span> no force-combined-si</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 871</span><br><span>@@ -224,7 +230,7 @@</span><br><span> max_power_red 20</span><br><span> rsl e1 tei 0</span><br><span> timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4+CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -275,7 +281,6 @@</span><br><span> si5 neighbor-list add arfcn 20</span><br><span> codec-support fr hr efr amr</span><br><span> gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs 11bit_rach_support_for_egprs 0</span><br><span> gprs routing area 0</span><br><span> gprs network-control-order nc0</span><br><span> gprs cell bvci 1236</span><br><span>@@ -307,6 +312,7 @@</span><br><span> gprs nsvc 1 remote udp port 0</span><br><span> gprs nsvc 1 remote ip 0.0.0.0</span><br><span> no force-combined-si</span><br><span style="color: hsl(120, 100%, 40%);">+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 871</span><br><span>@@ -314,7 +320,7 @@</span><br><span> max_power_red 20</span><br><span> rsl e1 tei 0</span><br><span> timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4+CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -341,7 +347,7 @@</span><br><span> type sysmobts</span><br><span> band DCS1800</span><br><span> cell_identity 3</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 2</span><br><span style="color: hsl(120, 100%, 40%);">+ location_area_code 3</span><br><span> # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config)</span><br><span> base_station_id_code 12</span><br><span> trx 0</span><br><span>@@ -381,10 +387,34 @@</span><br><span> amr-config 5_15k forbidden</span><br><span> amr-config 4_75k forbidden</span><br><span> codec-list fr1 fr2 fr3 hr1 hr3</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip 127.0.0.1</span><br><span> lcls-mode mgw-loop</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+ msc-addr msc2</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+ msc-addr msc3</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+ nri bitlen 10</span><br><span style="color: hsl(120, 100%, 40%);">+ # a NULL NRI that is outside the NRI ranges used by the MSCs:</span><br><span style="color: hsl(120, 100%, 40%);">+ nri null add 0</span><br><span style="color: hsl(120, 100%, 40%);">+ # a NULL NRI that is also used by an MSC:</span><br><span style="color: hsl(120, 100%, 40%);">+ nri null add 1</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 1 255</span><br><span style="color: hsl(120, 100%, 40%);">+msc 1</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 256 511</span><br><span style="color: hsl(120, 100%, 40%);">+msc 2</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 512 767</span><br><span style="color: hsl(120, 100%, 40%);">+ # range 768-1024 is not assigned to any MSC on purpose</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bsc</span><br><span> mid-call-timeout 0</span><br><span> no missing-msc-text</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 127.0.0.1</span><br><span> cbc</span><br><span> remote-ip 127.0.0.1</span><br><span> remote-port 48049</span><br><span>diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg</span><br><span>index f40a02f..8b8ccdb 100644</span><br><span>--- a/bsc/osmo-stp.cfg</span><br><span>+++ b/bsc/osmo-stp.cfg</span><br><span>@@ -6,7 +6,8 @@</span><br><span> logging filter all 1</span><br><span> logging color 1</span><br><span> logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging timestamp 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span> logging level all everything</span><br><span> logging level lglobal notice</span><br><span> logging level llapd notice</span><br><span>@@ -31,23 +32,34 @@</span><br><span> !</span><br><span> cs7 instance 0</span><br><span> xua rkm routing-key-allocation dynamic-permitted</span><br><span style="color: hsl(0, 100%, 40%);">-! asp virt-bsc0-0 22905 2905 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-! local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-! remote-ip 127.0.0.1</span><br><span> asp virt-msc0-0 23905 2905 m3ua</span><br><span> local-ip 127.0.0.1</span><br><span> remote-ip 127.0.0.1</span><br><span> as mahlzeit ipa</span><br><span style="color: hsl(0, 100%, 40%);">- routing-key 1 0.23.4</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 0 0.23.4</span><br><span> point-code override dpc 0.23.1</span><br><span style="color: hsl(0, 100%, 40%);">-! as virt-bsc0 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">-! asp virt-bsc0-0</span><br><span style="color: hsl(0, 100%, 40%);">-! routing-key 0 0.24.1</span><br><span> as virt-msc0 m3ua</span><br><span> asp virt-msc0-0</span><br><span style="color: hsl(0, 100%, 40%);">- routing-key 0 0.23.1</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 1 0.23.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-msc1-0 23906 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ as virt-msc1 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-msc1-0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 2 0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-msc2-0 23907 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ as virt-msc2 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-msc2-0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 3 0.0.3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> route-table system</span><br><span> update route 0.23.1 7.255.7 linkset virt-msc0</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 0.0.2 7.255.7 linkset virt-msc1</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 0.0.3 7.255.7 linkset virt-msc2</span><br><span> listen m3ua 2905</span><br><span> accept-asp-connections dynamic-permitted</span><br><span> listen ipa 5000</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18944">change 18944</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/osmo-ttcn3-hacks/+/18944"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3a3f4c572b8a390882fb8f12807018ca19e4827c </div>
<div style="display:none"> Gerrit-Change-Number: 18944 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>