<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/23111">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Correct configuration written from vty<br><br>osmo-hlr would not read back written configuration due to<br>bad indentation in the mslookup->server->service section.<br><br>Also ipa-name was missing.<br><br>Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb<br>---<br>M src/dgsm_vty.c<br>M src/hlr_vty.c<br>M tests/test_nodes.vty<br>3 files changed, 12 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c</span><br><span>index 6f29d3b..00a60ea 100644</span><br><span>--- a/src/dgsm_vty.c</span><br><span>+++ b/src/dgsm_vty.c</span><br><span>@@ -442,7 +442,7 @@</span><br><span> </span><br><span> msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false);</span><br><span> if (msc)</span><br><span style="color: hsl(0, 100%, 40%);">- config_write_msc_services(vty, " ", msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_msc_services(vty, " ", msc);</span><br><span> </span><br><span> llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) {</span><br><span> if (!osmo_ipa_name_cmp(&mslookup_server_msc_wildcard, &msc->name))</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index 4b91aa9..df2270b 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -102,6 +102,8 @@</span><br><span> vty_out(vty, " gsup%s", VTY_NEWLINE);</span><br><span> if (g_hlr->gsup_bind_addr)</span><br><span> vty_out(vty, " bind ip %s%s", g_hlr->gsup_bind_addr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->gsup_unit_name.serno)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa-name %s%s", g_hlr->gsup_unit_name.serno, VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 5848fe1..cce5703 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -107,6 +107,7 @@</span><br><span> database hlr_vty_test.db</span><br><span> gsup</span><br><span> bind ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa-name unnamed-HLR</span><br><span> ussd route prefix *#100# internal own-msisdn</span><br><span> ussd route prefix *#101# internal own-imsi</span><br><span> end</span><br><span>@@ -345,9 +346,9 @@</span><br><span> mslookup</span><br><span> server</span><br><span> mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(0, 100%, 40%);">- service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(0, 100%, 40%);">- service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(0, 100%, 40%);">- service baz.bar at a:b:c::d 1819</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at a:b:c::d 1819</span><br><span> msc MSC-1</span><br><span> msc msc-901-70-23</span><br><span> service foo.bar at 76.54.32.10 1234</span><br><span>@@ -401,8 +402,8 @@</span><br><span> mslookup</span><br><span> server</span><br><span> mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(0, 100%, 40%);">- service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(0, 100%, 40%);">- service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span> msc MSC-1</span><br><span> msc msc-901-70-23</span><br><span> service foo.bar at 76.54.32.10 1234</span><br><span>@@ -433,9 +434,9 @@</span><br><span> mslookup</span><br><span> server</span><br><span> mdns bind 239.192.23.42 4266</span><br><span style="color: hsl(0, 100%, 40%);">- service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(0, 100%, 40%);">- service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(0, 100%, 40%);">- service gsup.hlr at 23.42.17.11 4223</span><br><span style="color: hsl(120, 100%, 40%);">+ service foo.bar at 123.45.67.89 1011</span><br><span style="color: hsl(120, 100%, 40%);">+ service baz.bar at 121.31.41.5 1617</span><br><span style="color: hsl(120, 100%, 40%);">+ service gsup.hlr at 23.42.17.11 4223</span><br><span> msc MSC-1</span><br><span> msc msc-901-70-23</span><br><span> service foo.bar at 76.54.32.10 1234</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/23111">change 23111</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-hlr/+/23111"/><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-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb </div>
<div style="display:none"> Gerrit-Change-Number: 23111 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>