<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21690">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Improve VTY state introspection<br><br>* allow to print not only BSS-side BVCs, but also SGSN-side<br>* differentiate between SIG and PTP BVC<br>* print the actual BVC FSM state name instead of just UNBLOCKED/nothing<br><br>Change-Id: I8e09a9dc296b15094d191b0451d04457c815d116<br>---<br>M src/gbproxy/gb_proxy_vty.c<br>M tests/vty_test_runner.py<br>2 files changed, 35 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c</span><br><span>index 49ec91c..976ac12 100644</span><br><span>--- a/src/gbproxy/gb_proxy_vty.c</span><br><span>+++ b/src/gbproxy/gb_proxy_vty.c</span><br><span>@@ -58,15 +58,29 @@</span><br><span> </span><br><span> static void gbprox_vty_print_bvc(struct vty *vty, struct gbproxy_bvc *bvc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ra_id raid;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_parse_ra(&raid, bvc->ra);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "NSEI %5u, PTP-BVCI %5u, "</span><br><span style="color: hsl(0, 100%, 40%);">- "RAI %s", bvc->nse->nsei, bvc->bvci, osmo_rai_name(&raid));</span><br><span style="color: hsl(0, 100%, 40%);">- if (bssgp_bvc_fsm_is_unblocked(bvc->fi))</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " [BVC-BLOCKED]");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bvc->bvci == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "NSEI %5u, SIG-BVCI %5u [%s]%s", bvc->nse->nsei, bvc->bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ra_id raid;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_parse_ra(&raid, bvc->ra);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "NSEI %5u, PTP-BVCI %5u, RAI %s [%s]%s", bvc->nse->nsei, bvc->bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rai_name(&raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+static void gbproxy_vty_print_nse(struct vty *vty, struct gbproxy_nse *nse, bool show_stats)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_bvc *bvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int j;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hash_for_each(nse->bvcs, j, bvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gbprox_vty_print_bvc(vty, bvc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (show_stats)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_rate_ctr_group(vty, " ", bvc->ctrg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int config_write_gbproxy(struct vty *vty)</span><br><span>@@ -184,24 +198,25 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy [stats]",</span><br><span style="color: hsl(0, 100%, 40%);">- SHOW_STR "Display information about the Gb proxy\n" "Show statistics\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy (bss|sgsn) [stats]",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information about the Gb proxy\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Display BSS-side BVCs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Display SGSN-side BVCs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show statistics\n")</span><br><span> {</span><br><span> struct gbproxy_nse *nse;</span><br><span style="color: hsl(0, 100%, 40%);">- int show_stats = argc >= 1;</span><br><span style="color: hsl(0, 100%, 40%);">- int i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool show_stats = argc >= 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span> </span><br><span> if (show_stats)</span><br><span> vty_out_rate_ctr_group(vty, "", g_cfg->ctrg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- hash_for_each(g_cfg->bss_nses, i, nse, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gbproxy_bvc *bvc;</span><br><span style="color: hsl(0, 100%, 40%);">- hash_for_each(nse->bvcs, j, bvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- gbprox_vty_print_bvc(vty, bvc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (show_stats)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out_rate_ctr_group(vty, " ", bvc->ctrg);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "bss")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ hash_for_each(g_cfg->bss_nses, i, nse, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ gbproxy_vty_print_nse(vty, nse, show_stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ hash_for_each(g_cfg->sgsn_nses, i, nse, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ gbproxy_vty_print_nse(vty, nse, show_stats);</span><br><span> }</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index 4587564..be40abc 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -97,7 +97,7 @@</span><br><span> res = self.vty.command("show ns")</span><br><span> self.assertTrue(res.find('UDP bind') >= 0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- res = self.vty.command("show gbproxy stats")</span><br><span style="color: hsl(120, 100%, 40%);">+ res = self.vty.command("show gbproxy bss stats")</span><br><span> self.assertTrue(res.find('GBProxy Global Statistics') >= 0)</span><br><span> </span><br><span> def testVtyDeletePeer(self):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21690">change 21690</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-sgsn/+/21690"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8e09a9dc296b15094d191b0451d04457c815d116 </div>
<div style="display:none"> Gerrit-Change-Number: 21690 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>