<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17682">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Ensure osmo-bsc.fg + BSC_Tests_CBSP.ttcn defaults match<br><br>We want to make sure that the tests + config match<br><br>Change-Id: I9d6ed0aed34bb983c8db225c7762ceffa642decd<br>---<br>M bsc/BSC_Tests_CBSP.ttcn<br>M bsc/osmo-bsc.cfg<br>2 files changed, 16 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>index bf1d99e..ff054fe 100644</span><br><span>--- a/bsc/BSC_Tests_CBSP.ttcn</span><br><span>+++ b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>@@ -42,14 +42,14 @@</span><br><span> integer mp_cbc_port := 48049;</span><br><span> integer mp_bsc_cbsp_port := 48050;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* BTS 0: 262-42-1-0 with CBCH</span><br><span style="color: hsl(0, 100%, 40%);">- * BTS 1: 262-42-1-1 with CBCH</span><br><span style="color: hsl(0, 100%, 40%);">- * BTS 2: 262-42-2-1 with CBCH</span><br><span style="color: hsl(0, 100%, 40%);">- * BTS 3: 262-42-2-3 without CBCH */</span><br><span style="color: hsl(0, 100%, 40%);">- GsmCgiAbstract mp_cgi_bts0 := { '262'H, '42'H, 1, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">- GsmCgiAbstract mp_cgi_bts1 := { '262'H, '42'H, 1, 1 };</span><br><span style="color: hsl(0, 100%, 40%);">- GsmCgiAbstract mp_cgi_bts2 := { '262'H, '42'H, 2, 1 };</span><br><span style="color: hsl(0, 100%, 40%);">- GsmCgiAbstract mp_cgi_bts3 := { '262'H, '42'H, 2, 3 };</span><br><span style="color: hsl(120, 100%, 40%);">+ /* BTS 0: 001-01-1-0 with CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS 1: 001-01-1-1 with CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS 2: 001-01-2-1 with CBCH</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS 3: 001-01-2-3 without CBCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmCgiAbstract mp_cgi_bts0 := { '001'H, '01'H, 1, 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmCgiAbstract mp_cgi_bts1 := { '001'H, '01'H, 1, 1 };</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmCgiAbstract mp_cgi_bts2 := { '001'H, '01'H, 2, 1 };</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmCgiAbstract mp_cgi_bts3 := { '001'H, '01'H, 2, 3 };</span><br><span> }</span><br><span> </span><br><span> private type record GsmCgiAbstract {</span><br><span>diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg</span><br><span>index 74fe255..f490433 100644</span><br><span>--- a/bsc/osmo-bsc.cfg</span><br><span>+++ b/bsc/osmo-bsc.cfg</span><br><span>@@ -134,7 +134,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</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4+CBCH</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -224,7 +224,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</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4+CBCH</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -314,7 +314,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</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4+CBCH</span><br><span> hopping enabled 0</span><br><span> timeslot 1</span><br><span> phys_chan_config TCH/F</span><br><span>@@ -341,7 +341,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 3</span><br><span style="color: hsl(120, 100%, 40%);">+ location_area_code 2</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>@@ -387,3 +387,7 @@</span><br><span> mid-call-timeout 0</span><br><span> no missing-msc-text</span><br><span> access-list-name bsc-list</span><br><span style="color: hsl(120, 100%, 40%);">+cbc</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 48049</span><br><span style="color: hsl(120, 100%, 40%);">+ listen-port 48050</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17682">change 17682</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/+/17682"/><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: I9d6ed0aed34bb983c8db225c7762ceffa642decd </div>
<div style="display:none"> Gerrit-Change-Number: 17682 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>