<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11721">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add command to show TRX selectively<br><br>Add following commands showing only TRX with appropriate RSL link<br>status:<br>* show trx connected<br>* show trx disconnected<br><br>This simplifies troubleshooting of complex setup with multiple BTS with<br>several TRX each.<br><br>Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 54 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11721/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 410cdac..cf361bf 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1073,8 +1073,14 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool show_connected)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (show_connected && !trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!show_connected && trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s",</span><br><span> trx->nr, trx->bts->nr, trx->arfcn, VTY_NEWLINE);</span><br><span> vty_out(vty, "Description: %s%s",</span><br><span>@@ -1085,7 +1091,8 @@</span><br><span> trx->nominal_power - trx->max_power_red, VTY_NEWLINE);</span><br><span> vty_out(vty, " NM State: ");</span><br><span> net_dump_nmstate(vty, &trx->mo.nm_state);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (print_rsl)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE);</span><br><span> vty_out(vty, " Baseband Transceiver NM State: ");</span><br><span> net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state);</span><br><span> if (is_ipaccess_bts(trx->bts)) {</span><br><span>@@ -1097,11 +1104,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_dump_vty_all(struct vty *vty, struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_dump_vty(vty, trx, true, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_dump_vty(vty, trx, true, false);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts)</span><br><span> {</span><br><span> uint8_t trx_nr;</span><br><span> for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++)</span><br><span style="color: hsl(0, 100%, 40%);">- trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr));</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_trx,</span><br><span>@@ -1131,7 +1144,8 @@</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> if (bts) {</span><br><span>@@ -1146,6 +1160,40 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline void print_all_trx_ext(struct vty *vty, bool show_connected)</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%);">+ struct gsm_bts *bts = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(net, bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++)</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr), false, show_connected);</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%);">+DEFUN(show_trx_con,</span><br><span style="color: hsl(120, 100%, 40%);">+ show_trx_con_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show trx connected",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information about a TRX\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show TRX with RSL connected\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ print_all_trx_ext(vty, true);</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 style="color: hsl(120, 100%, 40%);">+DEFUN(show_trx_dis,</span><br><span style="color: hsl(120, 100%, 40%);">+ show_trx_dis_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show trx disconnected",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information about a TRX\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show TRX with RSL disconnected\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ print_all_trx_ext(vty, false);</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> </span><br><span> static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span>@@ -4896,6 +4944,8 @@</span><br><span> install_element_ve(&show_bts_cmd);</span><br><span> install_element_ve(&show_rejected_bts_cmd);</span><br><span> install_element_ve(&show_trx_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_trx_con_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_trx_dis_cmd);</span><br><span> install_element_ve(&show_ts_cmd);</span><br><span> install_element_ve(&show_lchan_cmd);</span><br><span> install_element_ve(&show_lchan_summary_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11721">change 11721</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/11721"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a </div>
<div style="display:none"> Gerrit-Change-Number: 11721 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>