<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20399">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Set all NM OML objects to Locked by default<br><br>Before they were set with a value of 0, which had no related enum field,<br>but since in general all comparsions are done against NM_STATE_UNLOCKED<br>they also hold valid.<br><br>The major change in behavior with this patch is upon OML link down,<br>where gsm_bts_mo_reset() is called on all objects. This way, upon OML<br>re-establishment we have again all objects as Locked again, which is the<br>expected default value as per TS 12.21.<br><br>Change-Id: I68ae0bc51a565f903b47cf72f3e3dd6f1a2d2651<br>---<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/gsm_data.c<br>M tests/ctrl_test_runner.py<br>3 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 25a3fc7..65ff752 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -41,7 +41,6 @@</span><br><span> </span><br><span>      trx->bts = bts;</span><br><span>   trx->nr = bts->num_trx++;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->mo.nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span> </span><br><span>  gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER,</span><br><span>                   bts->nr, trx->nr, 0xff);</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 1152783..22616f3 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -153,6 +153,7 @@</span><br><span> {</span><br><span>       mo->nm_state.operational = NM_OPSTATE_NULL;</span><br><span>       mo->nm_state.availability = NM_AVSTATE_POWER_OFF;</span><br><span style="color: hsl(120, 100%, 40%);">+  mo->nm_state.administrative = NM_STATE_LOCKED;</span><br><span> }</span><br><span> </span><br><span> void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts,</span><br><span>diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py</span><br><span>index 2ccbfe8..55a4ca6 100755</span><br><span>--- a/tests/ctrl_test_runner.py</span><br><span>+++ b/tests/ctrl_test_runner.py</span><br><span>@@ -292,7 +292,7 @@</span><br><span>         r = self.do_get('bts.0.rf_state')</span><br><span>         self.assertEqual(r['mtype'], 'GET_REPLY')</span><br><span>         self.assertEqual(r['var'], 'bts.0.rf_state')</span><br><span style="color: hsl(0, 100%, 40%);">-        self.assertEqual(r['value'], 'inoperational,unlocked,on')</span><br><span style="color: hsl(120, 100%, 40%);">+        self.assertEqual(r['value'], 'inoperational,locked,on')</span><br><span> </span><br><span>         r = self.do_set('rf_locked', '1')</span><br><span>         self.assertEqual(r['mtype'], 'SET_REPLY')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20399">change 20399</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-bsc/+/20399"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I68ae0bc51a565f903b47cf72f3e3dd6f1a2d2651 </div>
<div style="display:none"> Gerrit-Change-Number: 20399 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>