<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11847">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">templates: bsc/nitb: Remove explicit no force-combined-si<br><br>It's always been the default anyway, so no need to explicitly state it.<br>Furthermore, recently (osmobsc 167cb828665b91ed7d28007abd4a1862ebbb78c9)<br>force-combined-si was enabled by default for nanoBTS due to issues with<br>some MS not registering when it's not enabled, so let's osmo-bsc decide<br>were should it be enabled.<br><br>Related: OS#3063<br>Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1<br>---<br>M selftest/template_test.ok<br>M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl<br>3 files changed, 0 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/template_test.ok b/selftest/template_test.ok</span><br><span>index f970bf6..88b77b0 100644</span><br><span>--- a/selftest/template_test.ok</span><br><span>+++ b/selftest/template_test.ok</span><br><span>@@ -77,7 +77,6 @@</span><br><span>   gprs nsvc 0 local udp port 23020</span><br><span>   gprs nsvc 0 remote udp port 23000</span><br><span>   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0</span><br><span style="color: hsl(0, 100%, 40%);">-  no force-combined-si</span><br><span>   trx 0</span><br><span>    rf_locked 0</span><br><span>    arfcn val_trx_arfcn_trx0</span><br><span>@@ -148,7 +147,6 @@</span><br><span>   gprs nsvc 0 local udp port 23020</span><br><span>   gprs nsvc 0 remote udp port 23000</span><br><span>   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1</span><br><span style="color: hsl(0, 100%, 40%);">-  no force-combined-si</span><br><span>   trx 0</span><br><span>    rf_locked 0</span><br><span>    arfcn val_trx_arfcn_trx0</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>index 4f39f79..53e683b 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>@@ -85,7 +85,6 @@</span><br><span>   gprs nsvc 0 local udp port 23020</span><br><span>   gprs nsvc 0 remote udp port 23000</span><br><span>   gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr}</span><br><span style="color: hsl(0, 100%, 40%);">-  no force-combined-si</span><br><span> % else:</span><br><span>   gprs mode none</span><br><span> % endif</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl</span><br><span>index 764ca94..ee7381f 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl</span><br><span>@@ -77,7 +77,6 @@</span><br><span>   gprs nsvc 0 local udp port 23020</span><br><span>   gprs nsvc 0 remote udp port 23000</span><br><span>   gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr}</span><br><span style="color: hsl(0, 100%, 40%);">-  no force-combined-si</span><br><span> % else:</span><br><span>   gprs mode none</span><br><span> % endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11847">change 11847</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/11847"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 </div>
<div style="display:none"> Gerrit-Change-Number: 11847 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>