<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21830">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2000: Add "show bts 0 om2k-mo" command<br><br>Change-Id: Ib81c717bf29aa29c8ac634a959abd12accd1046e<br>---<br>M src/osmo-bsc/abis_om2000_vty.c<br>1 file changed, 72 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c</span><br><span>index 206fd6b..ef063a1 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000_vty.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000_vty.c</span><br><span>@@ -658,8 +658,80 @@</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void vty_dump_om2k_mo(struct vty *vty, const struct om2k_mo *mo, const char *pfx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int pfx_len = strlen(pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *mo_name = abis_om2k_mo_name(&mo->addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int pfx_mo_len = pfx_len + strlen(mo_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int pfx2_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ char pfx2[23];</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%);">+ /* generate padding after MO class to align the state names in the same column */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pfx_mo_len > sizeof(pfx2)-1)</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx2_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx2_len = sizeof(pfx2)-1 - pfx_mo_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < pfx2_len; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx2[i] = ' ';</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx2[pfx2_len] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s%s%s %s%s", pfx, mo_name, pfx2,</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->fsm ? osmo_fsm_inst_state_name(mo->fsm) : "[NULL]",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</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%);">+DEFUN(show_om2k_mo, show_om2k_mo_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show bts <0-255> om2k-mo",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information about a BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "BTS number\n" "OM2000 Managed Object information\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = gsmnet_from_vty(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = gsm_bts_num(net, bts_nr);</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%);">+ if (!bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% can't find BTS '%s'%s", argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ if (bts->type != GSM_BTS_TYPE_RBS2000) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS is not using OM2000%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ vty_out(vty, "BTS %3u OM2K-FSM state %s%s", bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_name(bts->rbs2000.bts_fi), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.cf.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.con.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.is.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.dp.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.tf.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &bts->rbs2000.mctr.om2k_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%);">+ llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int tn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " TRX %u OM2K-FSM state %s%s", trx->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_name(trx->rbs2000.trx_fi), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &trx->rbs2000.trxc.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &trx->rbs2000.rx.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &trx->rbs2000.tx.om2k_mo, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_om2k_mo(vty, &ts->rbs2000.om2k_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%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int abis_om2k_vty_init(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_om2k_mo_cmd);</span><br><span> install_element(ENABLE_NODE, &om2k_class_inst_cmd);</span><br><span> install_element(ENABLE_NODE, &om2k_classnum_inst_cmd);</span><br><span> install_node(&om2k_node, dummy_config_write);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21830">change 21830</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/+/21830"/><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: Ib81c717bf29aa29c8ac634a959abd12accd1046e </div>
<div style="display:none"> Gerrit-Change-Number: 21830 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: 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>