<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11117">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: install 'show cs7' for sccp addrs on _ve nodes<br><br>The 'show cs7 instance 0 sccp-addressbook' command should not be inside the<br>'cs7' node. That defies the point of naming the instance again, and it falls<br>out of place of all the other 'show cs7' commands on the VIEW and ENABLE nodes.<br><br>Drop the old command within the 'cs7' node without substitution or deprecation.<br><br>At the same time, drop dash from 'show cs7 i 0 sccp-addressbook'<br><br>There are various other show cs7 commands already defined in sccp_vty.c, which<br>have 'sccp' as a separate string. Conform to that.<br><br>Change-Id: I80e0bc0a91bcd3fb75372045db34592d2d663d41<br>---<br>M src/osmo_ss7_vty.c<br>M tests/vty/ss7_asp_test.vty<br>2 files changed, 13 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 1e2f437..14539b6 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> </span><br><span> #include "xua_internal.h"</span><br><span> #include <osmocom/sigtran/sccp_sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "sccp_internal.h"</span><br><span> </span><br><span> #define XUA_VAR_STR "(sua|m3ua|ipa)"</span><br><span> </span><br><span>@@ -1164,8 +1165,9 @@</span><br><span> </span><br><span> /* List all addressbook entries */</span><br><span> DEFUN(cs7_show_sccpaddr, cs7_show_sccpaddr_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show cs7 instance <0-15> sccp-addressbook",</span><br><span style="color: hsl(0, 100%, 40%);">- SHOW_STR CS7_STR INST_STR INST_STR "List all SCCP addressbook entries\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "show cs7 instance <0-15> sccp addressbook",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "List all SCCP addressbook entries\n")</span><br><span> {</span><br><span> struct osmo_ss7_instance *inst;</span><br><span> struct osmo_sccp_addr_entry *entry;</span><br><span>@@ -1727,7 +1729,7 @@</span><br><span> static void vty_init_addr(void)</span><br><span> {</span><br><span> install_node(&sccpaddr_node, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(L_CS7_NODE, &cs7_show_sccpaddr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&cs7_show_sccpaddr_cmd);</span><br><span> install_element(L_CS7_NODE, &cs7_sccpaddr_cmd);</span><br><span> install_element(L_CS7_NODE, &cs7_sccpaddr_del_cmd);</span><br><span> install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_pc_del_cmd);</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index f96e0c0..fee97b3 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -4,6 +4,7 @@</span><br><span> show cs7 (sua|m3ua|ipa) [<0-65534>]</span><br><span> show cs7 instance <0-15> asp</span><br><span> show cs7 instance <0-15> as (active|all|m3ua|sua)</span><br><span style="color: hsl(120, 100%, 40%);">+ show cs7 instance <0-15> sccp addressbook</span><br><span> show cs7 instance <0-15> sccp users</span><br><span> show cs7 instance <0-15> sccp ssn <0-65535></span><br><span> show cs7 instance <0-15> sccp connections</span><br><span>@@ -16,6 +17,7 @@</span><br><span> show cs7 (sua|m3ua|ipa) [<0-65534>]</span><br><span> show cs7 instance <0-15> asp</span><br><span> show cs7 instance <0-15> as (active|all|m3ua|sua)</span><br><span style="color: hsl(120, 100%, 40%);">+ show cs7 instance <0-15> sccp addressbook</span><br><span> show cs7 instance <0-15> sccp users</span><br><span> show cs7 instance <0-15> sccp ssn <0-65535></span><br><span> show cs7 instance <0-15> sccp connections</span><br><span>@@ -51,6 +53,7 @@</span><br><span> sua Display all SUA ASs</span><br><span> </span><br><span> ss7_asp_vty_test# show cs7 instance 0 sccp ?</span><br><span style="color: hsl(120, 100%, 40%);">+ addressbook List all SCCP addressbook entries</span><br><span> users Show List of SCCP Users registered</span><br><span> ssn Show List of SCCP Users registered</span><br><span> connections Show List of SCCP Users registered</span><br><span>@@ -74,7 +77,6 @@</span><br><span> no asp NAME</span><br><span> as NAME (sua|m3ua|ipa)</span><br><span> no as NAME</span><br><span style="color: hsl(0, 100%, 40%);">- show cs7 instance <0-15> sccp-addressbook</span><br><span> sccp-address NAME</span><br><span> no sccp-address NAME</span><br><span> </span><br><span>@@ -176,7 +178,11 @@</span><br><span> ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7-sccpaddr)# do show cs7 instance 0 sccp addressbook</span><br><span style="color: hsl(0, 100%, 40%);">-% Unknown command.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Name RI: PC: SSN: GT:</span><br><span style="color: hsl(120, 100%, 40%);">+------------ --- --------- ---------- --------------------------------------- </span><br><span style="color: hsl(120, 100%, 40%);">+foo PC 1.2.3 (none) (none)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ss7_asp_vty_test(config-cs7-sccpaddr)# exit</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11117">change 11117</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/11117"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I80e0bc0a91bcd3fb75372045db34592d2d663d41 </div>
<div style="display:none"> Gerrit-Change-Number: 11117 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>