Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Neels Hofmeyr has submitted this change and it was merged. (
https://gerrit.osmocom.org/12387 )
Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
..
vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
during code review, I completely overlooked this:
We've added the 'ipa-name', which identifies the MSC on the GSUP link to the
HLR, under the 'msc' section, while all other GSUP/HLR related config is under
the 'hlr' section.
Before we roll that out in a release, move it over to 'hlr'.
Related: OS#3355
Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
---
M src/libmsc/msc_vty.c
M tests/test_nodes.vty
2 files changed, 22 insertions(+), 23 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 201d2aa..8c11900 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -458,24 +458,6 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_msc_ipa_name,
- cfg_msc_ipa_name_cmd,
- "ipa-name NAME",
- "Set the IPA name of this MSC\n"
- "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
- "This name is used for GSUP routing and must be set if more than one MSC
is connected to the HLR. "
- "The default is 'MSC-00-00-00-00-00-00'.\n")
-{
- if (vty->type != VTY_FILE) {
- vty_out(vty, "The IPA name cannot be changed at run-time; "
- "It can only be set in the configuraton file.%s",
VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
- return CMD_SUCCESS;
-}
-
/* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */
DEFUN(cfg_msc_sms_over_gsup, cfg_msc_sms_over_gsup_cmd,
"sms-over-gsup",
@@ -527,9 +509,6 @@
gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);
}
- if (gsmnet->msc_ipa_name)
- vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
-
if (gsmnet->sms_over_gsup)
vty_out(vty, " sms-over-gsup%s", VTY_NEWLINE);
@@ -1506,6 +1485,24 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_hlr_ipa_name,
+ cfg_hlr_ipa_name_cmd,
+ "ipa-name NAME",
+ "Set the IPA name of this MSC\n"
+ "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
+ "This name is used for GSUP routing and must be set if more than one MSC
is connected to the HLR. "
+ "The default is 'MSC-00-00-00-00-00-00'.\n")
+{
+ if (vty->type != VTY_FILE) {
+ vty_out(vty, "The IPA name cannot be changed at run-time; "
+ "It can only be set in the configuraton file.%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
+ return CMD_SUCCESS;
+}
+
static int config_write_hlr(struct vty *vty)
{
vty_out(vty, "hlr%s", VTY_NEWLINE);
@@ -1513,6 +1510,8 @@
gsmnet->gsup_server_addr_str, VTY_NEWLINE);
vty_out(vty, " remote-port %u%s",
gsmnet->gsup_server_port, VTY_NEWLINE);
+ if (gsmnet->msc_ipa_name)
+ vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
return CMD_SUCCESS;
}
@@ -1553,7 +1552,6 @@
install_element(MSC_NODE, _msc_cs7_instance_iu_cmd);
install_element(MSC_NODE, _msc_paging_response_timer_cmd);
install_element(MSC_NODE, _msc_emergency_msisdn_cmd);
- install_element(MSC_NODE, _msc_ipa_name_cmd);
install_element(MSC_NODE, _msc_sms_over_gsup_cmd);
install_element(MSC_NODE, _msc_no_sms_over_gsup_cmd);
@@ -1605,4 +1603,5 @@
install_node(_node, config_write_hlr);
install_element(HLR_NODE, _hlr_remote_ip_cmd);
install_element(HLR_NODE, _hlr_remote_port_cmd);
+ install_element(HLR_NODE, _hlr_ipa_name_cmd);
}
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index 18467d9..3fd37b0 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -40,7 +40,6 @@
cs7-instance-iu <0-15>
paging response-timer (default|<1-65535>)
emergency-call route-to-msisdn MSISDN
- ipa-name NAME
sms-over-gsup
no sms-over-gsup
mgw local-ip A.B.C.D
@@ -85,6 +84,7 @@
...
remote-ip A.B.C.D
remote-port <1-65535>
+ ipa-name NAME
OsmoMSC(config-hlr)# exit
OsmoMSC(config)# exit
--
To view, visit https://gerrit.osmocom.org/12387
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
Gerrit-Change-Number: 12387
Gerrit-PatchSet: 5
Gerrit-Owner: Neels Hofmeyr
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 03 Jan 2019 16:13:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#4). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Related: OS#3355 Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/4 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 22 Dec 2018 20:19:36 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#3). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Related: OS#3355 Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/3 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#2). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 1: Also please add this to the log msg: Related: OS#3355 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:40:03 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section .. Patch Set 1: Please update expected VTY test output as well. -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:39:09 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/12387
Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
..
vty cfg: move 'ipa-name' from 'msc' to 'hlr' section
during code review, I completely overlooked this:
We've added the 'ipa-name', which identifies the MSC on the GSUP link to the
HLR, under the 'msc' section, while all other GSUP/HLR related config is under
the 'hlr' section.
Before we roll that out in a release, move it over to 'hlr'.
Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
---
M src/libmsc/msc_vty.c
1 file changed, 21 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/1
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index c5d2832..bb57d65 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -458,24 +458,6 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_msc_ipa_name,
- cfg_msc_ipa_name_cmd,
- "ipa-name NAME",
- "Set the IPA name of this MSC\n"
- "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
- "This name is used for GSUP routing and must be set if more than one MSC
is connected to the HLR. "
- "The default is 'MSC-00-00-00-00-00-00'.\n")
-{
- if (!msc_parsing_config_file) {
- vty_out(vty, "The IPA name cannot be changed at run-time; "
- "It can only be set in the configuraton file.%s",
VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
- return CMD_SUCCESS;
-}
-
static int config_write_msc(struct vty *vty)
{
vty_out(vty, "msc%s", VTY_NEWLINE);
@@ -509,9 +491,6 @@
gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);
}
- if (gsmnet->msc_ipa_name)
- vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
-
mgcp_client_config_write(vty, " ");
#ifdef BUILD_IU
ranap_iu_vty_config_write(vty, " ");
@@ -1485,6 +1464,24 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_hlr_ipa_name,
+ cfg_hlr_ipa_name_cmd,
+ "ipa-name NAME",
+ "Set the IPA name of this MSC\n"
+ "A unique name for this MSC. For example: PLMN + redundancy server
number: MSC-901-70-0. "
+ "This name is used for GSUP routing and must be set if more than one MSC
is connected to the HLR. "
+ "The default is 'MSC-00-00-00-00-00-00'.\n")
+{
+ if (!msc_parsing_config_file) {
+ vty_out(vty, "The IPA name cannot be changed at run-time; "
+ "It can only be set in the configuraton file.%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
+ return CMD_SUCCESS;
+}
+
static int config_write_hlr(struct vty *vty)
{
vty_out(vty, "hlr%s", VTY_NEWLINE);
@@ -1492,6 +1489,8 @@
gsmnet->gsup_server_addr_str, VTY_NEWLINE);
vty_out(vty, " remote-port %u%s",
gsmnet->gsup_server_port, VTY_NEWLINE);
+ if (gsmnet->msc_ipa_name)
+ vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name,
VTY_NEWLINE);
return CMD_SUCCESS;
}
@@ -1532,7 +1531,6 @@
install_element(MSC_NODE, _msc_cs7_instance_iu_cmd);
install_element(MSC_NODE, _msc_paging_response_timer_cmd);
install_element(MSC_NODE, _msc_emergency_msisdn_cmd);
- install_element(MSC_NODE, _msc_ipa_name_cmd);
mgcp_client_vty_init(msc_network, MSC_NODE, _network->mgw.conf);
#ifdef BUILD_IU
@@ -1582,4 +1580,5 @@
install_node(_node, config_write_hlr);
install_element(HLR_NODE, _hlr_remote_ip_cmd);
install_element(HLR_NODE, _hlr_remote_port_cmd);
+ install_element(HLR_NODE, _hlr_ipa_name_cmd);
}
--
To view, visit https://gerrit.osmocom.org/12387
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425
Gerrit-Change-Number: 12387
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr
