<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24686">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: 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;">gprs_ns2_vty: dump_nsvc: change output depending on NSVCI<br><br>If the NSVCI is valid, there is no signalling or data weight defined (internally this is 1).<br>For NSVC with NSVCI don't print the signalling or data weight.<br>For NSVC without NSVCI, don't print NSVCI at all.<br><br>Related: OS#5180<br>Change-Id: Iaadc806a9136436468e2b02eb0bc1f4570a10ecc<br>---<br>M src/gb/gprs_ns2_vty.c<br>M tests/gb/gprs_ns2_vty.vty<br>2 files changed, 17 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 2f540c2..0aa7902 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -1873,18 +1873,17 @@</span><br><span> /* non-config commands */</span><br><span> void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char nsvci_str[32];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (nsvc->nsvci_is_valid)</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(nsvci_str, sizeof(nsvci_str), "%05u", nsvc->nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " NSVCI %05u: %s %s %s%s", nsvc->nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_name(nsvc->fi),</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->persistent ? "PERSIST" : "DYNAMIC",</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_ll_str(nsvc), VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(nsvci_str, sizeof(nsvci_str), "none");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " NSVCI %s: %s %s data_weight=%u sig_weight=%u %s%s", nsvci_str,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_name(nsvc->fi),</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->persistent ? "PERSIST" : "DYNAMIC",</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->data_weight, nsvc->sig_weight,</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_ll_str(nsvc), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s %s sig_weight=%u data_weight=%u %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_name(nsvc->fi),</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->persistent ? "PERSIST" : "DYNAMIC",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->sig_weight, nsvc->data_weight,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_ll_str(nsvc), VTY_NEWLINE);</span><br><span> </span><br><span> if (stats) {</span><br><span> vty_out_rate_ctr_group(vty, " ", nsvc->ctrg);</span><br><span>diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty</span><br><span>index 458e2c8..45c8a16 100644</span><br><span>--- a/tests/gb/gprs_ns2_vty.vty</span><br><span>+++ b/tests/gb/gprs_ns2_vty.vty</span><br><span>@@ -40,11 +40,11 @@</span><br><span> OsmoNSdummy# show ns</span><br><span> NSEI 01234: UDP, DEAD</span><br><span> 1 NS-VC:</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span> UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0</span><br><span> IP-SNS signalling weight: 1 data weight: 1</span><br><span> 1 NS-VC:</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span> OsmoNSdummy# configure terminal</span><br><span> OsmoNSdummy(config)# ns</span><br><span> OsmoNSdummy(config-ns)# nse 1234</span><br><span>@@ -54,15 +54,15 @@</span><br><span> OsmoNSdummy# show ns</span><br><span> NSEI 01234: UDP, DEAD</span><br><span> 3 NS-VC:</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span> UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0</span><br><span> IP-SNS signalling weight: 1 data weight: 1</span><br><span> 3 NS-VC:</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(0, 100%, 40%);">- NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496</span><br><span style="color: hsl(120, 100%, 40%);">+ RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496</span><br><span> OsmoNSdummy# configure terminal</span><br><span> OsmoNSdummy(config)# ns</span><br><span> OsmoNSdummy(config-ns)# nse 1234</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24686">change 24686</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/libosmocore/+/24686"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaadc806a9136436468e2b02eb0bc1f4570a10ecc </div>
<div style="display:none"> Gerrit-Change-Number: 24686 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>