<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18135">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;">bts_nokia_site: Fake 12.21 OM objet state as "OK" when boot is done<br><br>Parts of Osmo-BSC want to see the NM state as valid ...<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: I0db11819d23e40272c4aa6fd093365b9c13f7bcf<br>---<br>M src/osmo-bsc/bts_nokia_site.c<br>1 file changed, 35 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c</span><br><span>index cde0afa..8047682 100644</span><br><span>--- a/src/osmo-bsc/bts_nokia_site.c</span><br><span>+++ b/src/osmo-bsc/bts_nokia_site.c</span><br><span>@@ -1436,6 +1436,39 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void mo_ok(struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->nm_state.operational = NM_OPSTATE_ENABLED;</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->nm_state.administrative = NM_STATE_UNLOCKED;</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->nm_state.availability = NM_AVSTATE_OK;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void nokia_abis_nm_fake_1221_ok(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * The Nokia BTS don't follow the 12.21 model and we don't have OM objects</span><br><span style="color: hsl(120, 100%, 40%);">+ * for the various elements. However some of the BSC code depends on seeing</span><br><span style="color: hsl(120, 100%, 40%);">+ * those object "up & running", so when the Nokia init is done, we fake</span><br><span style="color: hsl(120, 100%, 40%);">+ * a "good" state</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_ok(&bts->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_ok(&bts->site_mgr.mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_ok(&trx->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_ok(&trx->bb_transc.mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_ok(&ts->mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* TODO: put in a separate file ? */</span><br><span> </span><br><span> /* taken from abis_nm.c */</span><br><span>@@ -1633,6 +1666,8 @@</span><br><span> case NOKIA_MSG_CONF_COMPLETE:</span><br><span> /* send ACK */</span><br><span> abis_nm_ack(bts, ref);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fake 12.21 OM */</span><br><span style="color: hsl(120, 100%, 40%);">+ nokia_abis_nm_fake_1221_ok(bts);</span><br><span> break;</span><br><span> case NOKIA_MSG_BLOCK_CTRL_REQ: /* seems to be send when something goes wrong !? */</span><br><span> /* send ACK (do we have to send an ACK ?) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18135">change 18135</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/+/18135"/><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: I0db11819d23e40272c4aa6fd093365b9c13f7bcf </div>
<div style="display:none"> Gerrit-Change-Number: 18135 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </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>