<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12055">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add 'show subscriber' command, alias for 'subscriber ... show'<br><br>When I wrote the osmo-hlr subscriber command, I failed to heed the common<br>'show foo' scheme and instead created a 'subscriber [...] show' command.<br>Relieve that weirdness by creating an alias that has 'show' at the start.<br><br>Arrange string macros so that the 'show subscriber' cmd doesn't end in a space<br>(the SUBSCR macro ends in a space ' ' to implicitly include the space to<br>commands like 'create', 'show', 'update').<br><br>Add the new command to test_nodes.vty and test_subscriber.vty.<br><br>Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4<br>---<br>M src/hlr_vty_subscr.c<br>M tests/test_nodes.vty<br>M tests/test_subscriber.vty<br>3 files changed, 16 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index 6ce96fe..ddbaf26 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -130,14 +130,14 @@</span><br><span> #define SUBSCR_CMD "subscriber "</span><br><span> #define SUBSCR_CMD_HELP "Subscriber management commands\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define SUBSCR_ID "(imsi|msisdn|id) IDENT "</span><br><span style="color: hsl(120, 100%, 40%);">+#define SUBSCR_ID "(imsi|msisdn|id) IDENT"</span><br><span> #define SUBSCR_ID_HELP \</span><br><span> "Identify subscriber by IMSI\n" \</span><br><span> "Identify subscriber by MSISDN (phone number)\n" \</span><br><span> "Identify subscriber by database ID\n" \</span><br><span> "IMSI/MSISDN/ID of the subscriber\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define SUBSCR SUBSCR_CMD SUBSCR_ID</span><br><span style="color: hsl(120, 100%, 40%);">+#define SUBSCR SUBSCR_CMD SUBSCR_ID " "</span><br><span> #define SUBSCR_HELP SUBSCR_CMD_HELP SUBSCR_ID_HELP</span><br><span> </span><br><span> #define SUBSCR_UPDATE SUBSCR "update "</span><br><span>@@ -159,6 +159,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ALIAS(subscriber_show, show_subscriber_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show " SUBSCR_CMD SUBSCR_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR SUBSCR_CMD_HELP SUBSCR_ID_HELP);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(subscriber_create,</span><br><span> subscriber_create_cmd,</span><br><span> SUBSCR_CMD "imsi IDENT create",</span><br><span>@@ -478,6 +482,7 @@</span><br><span> void hlr_vty_subscriber_init(void)</span><br><span> {</span><br><span> install_element_ve(&subscriber_show_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_subscriber_cmd);</span><br><span> install_element(ENABLE_NODE, &subscriber_create_cmd);</span><br><span> install_element(ENABLE_NODE, &subscriber_delete_cmd);</span><br><span> install_element(ENABLE_NODE, &subscriber_msisdn_cmd);</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index a9d4ac4..e1f57a9 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -18,6 +18,7 @@</span><br><span> show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP</span><br><span> show gsup-connections</span><br><span> subscriber (imsi|msisdn|id) IDENT show</span><br><span style="color: hsl(120, 100%, 40%);">+ show subscriber (imsi|msisdn|id) IDENT</span><br><span> </span><br><span> OsmoHLR> enable</span><br><span> OsmoHLR# list</span><br><span>diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty</span><br><span>index 2da455f..c22f2df 100644</span><br><span>--- a/tests/test_subscriber.vty</span><br><span>+++ b/tests/test_subscriber.vty</span><br><span>@@ -3,6 +3,7 @@</span><br><span> OsmoHLR# list</span><br><span> ...</span><br><span> subscriber (imsi|msisdn|id) IDENT show</span><br><span style="color: hsl(120, 100%, 40%);">+ show subscriber (imsi|msisdn|id) IDENT</span><br><span> subscriber imsi IDENT create</span><br><span> subscriber (imsi|msisdn|id) IDENT delete</span><br><span> subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN</span><br><span>@@ -33,6 +34,13 @@</span><br><span> OsmoHLR# subscriber msisdn 12345 show</span><br><span> % No subscriber for msisdn = '12345'</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# show subscriber imsi 123456789023000</span><br><span style="color: hsl(120, 100%, 40%);">+% No subscriber for imsi = '123456789023000'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# show subscriber id 1</span><br><span style="color: hsl(120, 100%, 40%);">+% No subscriber for id = '1'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# show subscriber msisdn 12345</span><br><span style="color: hsl(120, 100%, 40%);">+% No subscriber for msisdn = '12345'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoHLR# subscriber imsi 1234567890230001 create</span><br><span> % Not a valid IMSI: 1234567890230001</span><br><span> OsmoHLR# subscriber imsi 12345678902300x create</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12055">change 12055</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/12055"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 </div>
<div style="display:none"> Gerrit-Change-Number: 12055 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>