<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17571">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: add show bts failure report<br><br>Save OML failure reports from each BTS. Add a VTY command to display them<br>conveniently and optionally clear the list.<br><br>OsmoBSC> show bts 0 fail-rep<br>[2020-03-23 14:51:22] Type=processing failure, Severity=minor failure, Probable cause=Manufacturer specific values: Software warning, Additional text=test message sent from VTY<br>[2020-03-23 14:51:19] Type=processing failure, Severity=minor failure, Probable cause=Manufacturer specific values: Software warning, Additional text=test message sent from VTY<br><br>Related: OS#1605<br>Change-Id: I18aa17a721cd5eb1c98926dc2367229c0a50bc78<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/gsm_data.c<br>4 files changed, 86 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 5afc2cf..2595174 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1005,6 +1005,12 @@</span><br><span> uint8_t overflow;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct bts_oml_fail_rep {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list;</span><br><span style="color: hsl(120, 100%, 40%);">+ time_t time;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *mb;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* One BTS */</span><br><span> struct gsm_bts {</span><br><span> /* list header in net->bts_list */</span><br><span>@@ -1267,6 +1273,8 @@</span><br><span> struct bts_smscb_chan_state cbch_basic;</span><br><span> struct bts_smscb_chan_state cbch_extended;</span><br><span> struct osmo_timer_list etws_timer; /* when to stop ETWS PN */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head oml_fail_rep;</span><br><span> };</span><br><span> </span><br><span> /* One rejected BTS */</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 07effd3..32e9a8f 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -412,6 +412,21 @@</span><br><span> int rc = 0;</span><br><span> const uint8_t *p_val;</span><br><span> const char *e_type, *severity, *p_text;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_oml_fail_rep *entry;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Store copy in bts->oml_fail_rep */</span><br><span style="color: hsl(120, 100%, 40%);">+ entry = talloc_zero(bts, struct bts_oml_fail_rep);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ entry->time = time(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ entry->mb = msgb_copy_c(entry, mb, "OML failure report");</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&entry->list, &bts->oml_fail_rep);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Limit list size */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_count(&bts->oml_fail_rep) > 50) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_oml_fail_rep *old = llist_last_entry(&bts->oml_fail_rep, struct bts_oml_fail_rep, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&old->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(old);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> sd = abis_nm_fail_evt_rep_parse(mb, bts);</span><br><span> if (!sd) {</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 39adb21..e9085b3 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -559,6 +559,67 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_bts_fail_rep, show_bts_fail_rep_cmd, "show bts <0-255> fail-rep [reset]",</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" "OML failure reports\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Clear the list of failure reports after showing them\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%);">+ struct bts_oml_fail_rep *entry;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_nr = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_nr >= net->num_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%);">+ bts = gsm_bts_num(net, bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&bts->oml_fail_rep)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "No failure reports received.%s", VTY_NEWLINE);</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%);">+ llist_for_each_entry(entry, &bts->oml_fail_rep, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_fail_rep_signal_data *sd;</span><br><span style="color: hsl(120, 100%, 40%);">+ char timestamp[20]; /* format like 2020-03-23 14:24:00 */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum abis_nm_pcause_type pcause;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum abis_mm_event_causes cause;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ strftime(timestamp, sizeof(timestamp), "%F %T", localtime(&entry->time));</span><br><span style="color: hsl(120, 100%, 40%);">+ sd = abis_nm_fail_evt_rep_parse(entry->mb, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "[%s] (failed to parse report)%s", timestamp, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ pcause = sd->parsed.probable_cause[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = osmo_load16be(sd->parsed.probable_cause + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "[%s] Type=%s, Severity=%s, ", timestamp, sd->parsed.event_type, sd->parsed.severity);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Probable cause=%s: ", get_value_string(abis_nm_pcause_type_names, pcause));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcause == NM_PCAUSE_T_MANUF)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s, ", get_value_string(abis_mm_event_cause_names, cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%04X, ", cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Additional text=%s%s", sd->parsed.additional_text, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(sd);</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%);">+ /* Optionally clear the list */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!llist_empty(&bts->oml_fail_rep)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_oml_fail_rep *old = llist_last_entry(&bts->oml_fail_rep, struct bts_oml_fail_rep,</span><br><span style="color: hsl(120, 100%, 40%);">+ list);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&old->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(old);</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> DEFUN(show_rejected_bts, show_rejected_bts_cmd, "show rejected-bts",</span><br><span> SHOW_STR "Display recently rejected BTS devices\n")</span><br><span> {</span><br><span>@@ -5272,6 +5333,7 @@</span><br><span> </span><br><span> install_element_ve(&bsc_show_net_cmd);</span><br><span> install_element_ve(&show_bts_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_bts_fail_rep_cmd);</span><br><span> install_element_ve(&show_rejected_bts_cmd);</span><br><span> install_element_ve(&show_trx_cmd);</span><br><span> install_element_ve(&show_trx_con_cmd);</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index f12b032..fe421a4 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -881,6 +881,7 @@</span><br><span> INIT_LLIST_HEAD(&bts->abis_queue);</span><br><span> INIT_LLIST_HEAD(&bts->loc_list);</span><br><span> INIT_LLIST_HEAD(&bts->local_neighbors);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&bts->oml_fail_rep);</span><br><span> </span><br><span> /* Enable all codecs by default. These get reset to a more fine grained selection IF a</span><br><span> * 'codec-support' config appears in the config file (see bsc_vty.c). */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17571">change 17571</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/+/17571"/><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: I18aa17a721cd5eb1c98926dc2367229c0a50bc78 </div>
<div style="display:none"> Gerrit-Change-Number: 17571 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>