<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12387">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty cfg: move 'ipa-name' from 'msc' to 'hlr' section<br><br>during code review, I completely overlooked this:<br><br>We've added the 'ipa-name', which identifies the MSC on the GSUP link to the<br>HLR, under the 'msc' section, while all other GSUP/HLR related config is under<br>the 'hlr' section.<br><br>Before we roll that out in a release, move it over to 'hlr'.<br><br>Related: OS#3355<br>Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425<br>---<br>M src/libmsc/msc_vty.c<br>M tests/test_nodes.vty<br>2 files changed, 22 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 201d2aa..8c11900 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -458,24 +458,6 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_msc_ipa_name,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_msc_ipa_name_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "ipa-name NAME",</span><br><span style="color: hsl(0, 100%, 40%);">- "Set the IPA name of this MSC\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. "</span><br><span style="color: hsl(0, 100%, 40%);">- "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. "</span><br><span style="color: hsl(0, 100%, 40%);">- "The default is 'MSC-00-00-00-00-00-00'.\n")</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (vty->type != VTY_FILE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "The IPA name cannot be changed at run-time; "</span><br><span style="color: hsl(0, 100%, 40%);">- "It can only be set in the configuraton file.%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */</span><br><span> DEFUN(cfg_msc_sms_over_gsup, cfg_msc_sms_over_gsup_cmd,</span><br><span> "sms-over-gsup",</span><br><span>@@ -527,9 +509,6 @@</span><br><span> gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (gsmnet->msc_ipa_name)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (gsmnet->sms_over_gsup)</span><br><span> vty_out(vty, " sms-over-gsup%s", VTY_NEWLINE);</span><br><span> </span><br><span>@@ -1506,6 +1485,24 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_hlr_ipa_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_hlr_ipa_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa-name NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the IPA name of this MSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "The default is 'MSC-00-00-00-00-00-00'.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "The IPA name cannot be changed at run-time; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "It can only be set in the configuraton file.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int config_write_hlr(struct vty *vty)</span><br><span> {</span><br><span> vty_out(vty, "hlr%s", VTY_NEWLINE);</span><br><span>@@ -1513,6 +1510,8 @@</span><br><span> gsmnet->gsup_server_addr_str, VTY_NEWLINE);</span><br><span> vty_out(vty, " remote-port %u%s",</span><br><span> gsmnet->gsup_server_port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->msc_ipa_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1553,7 +1552,6 @@</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- install_element(MSC_NODE, &cfg_msc_ipa_name_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd);</span><br><span> </span><br><span>@@ -1605,4 +1603,5 @@</span><br><span> install_node(&hlr_node, config_write_hlr);</span><br><span> install_element(HLR_NODE, &cfg_hlr_remote_ip_cmd);</span><br><span> install_element(HLR_NODE, &cfg_hlr_remote_port_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HLR_NODE, &cfg_hlr_ipa_name_cmd);</span><br><span> }</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 18467d9..3fd37b0 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -40,7 +40,6 @@</span><br><span> cs7-instance-iu <0-15></span><br><span> paging response-timer (default|<1-65535>)</span><br><span> emergency-call route-to-msisdn MSISDN</span><br><span style="color: hsl(0, 100%, 40%);">- ipa-name NAME</span><br><span> sms-over-gsup</span><br><span> no sms-over-gsup</span><br><span> mgw local-ip A.B.C.D</span><br><span>@@ -85,6 +84,7 @@</span><br><span> ...</span><br><span> remote-ip A.B.C.D</span><br><span> remote-port <1-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ ipa-name NAME</span><br><span> </span><br><span> OsmoMSC(config-hlr)# exit</span><br><span> OsmoMSC(config)# exit</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12387">change 12387</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/12387"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 </div>
<div style="display:none"> Gerrit-Change-Number: 12387 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>
<div style="display:none"> Gerrit-CC: Stefan Sperling <stsp@stsp.name> </div>