summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2013-09-02 13:17:17 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-09-02 20:25:51 +0200
commit4c9dff5d8ecf99cdf3f354e3df38bed4cdc2be9c (patch)
tree5e7cb086f29b16f832e97ea39407e8645138ba51
parent0ae92a950a321835c6693e381e131df38febab2a (diff)
vty: Rename 'mgcp-through-msc-ipa' command to 'use-msc-ipa-for-mgcp'
Currently the 'mgcp' command fails in the 'config-nat' node, because it get confused with 'mgcp-through-msc-ipa' which is executed instead because of the prefix based command selection. Thus the latter command is renamed by this patch to avoid the common prefix. The workaround in the test suite is removed.
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat_vty.c10
-rw-r--r--openbsc/tests/vty_test_runner.py8
2 files changed, 9 insertions, 9 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 9eab574..72a6801 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -152,7 +152,7 @@ static int config_write_nat(struct vty *vty)
llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
write_pgroup_lst(vty, pgroup);
if (_nat->mgcp_ipa)
- vty_out(vty, " mgcp-through-msc-ipa%s", VTY_NEWLINE);
+ vty_out(vty, " use-msc-ipa-for-mgcp%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
@@ -754,9 +754,9 @@ DEFUN(cfg_nat_ussd_local,
return CMD_SUCCESS;
}
-DEFUN(cfg_nat_mgcp_ipa,
- cfg_nat_mgcp_ipa_cmd,
- "mgcp-through-msc-ipa",
+DEFUN(cfg_nat_use_ipa_for_mgcp,
+ cfg_nat_use_ipa_for_mgcp_cmd,
+ "use-msc-ipa-for-mgcp",
"This needs to be set at start. Handle MGCP messages through "
"the IPA protocol and not through the UDP socket.\n")
{
@@ -1209,7 +1209,7 @@ int bsc_nat_vty_init(struct bsc_nat *nat)
install_element(NAT_NODE, &cfg_nat_ussd_query_cmd);
install_element(NAT_NODE, &cfg_nat_ussd_token_cmd);
install_element(NAT_NODE, &cfg_nat_ussd_local_cmd);
- install_element(NAT_NODE, &cfg_nat_mgcp_ipa_cmd);
+ install_element(NAT_NODE, &cfg_nat_use_ipa_for_mgcp_cmd);
/* access-list */
install_element(NAT_NODE, &cfg_lst_imsi_allow_cmd);
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 5af59a9..15a73ce 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -264,13 +264,13 @@ class TestVTYNAT(TestVTYGenericBSC):
self.vty.command('mgcp')
self.vty.command('nat')
self.assertEquals(self.vty.node(), 'config-nat')
- self.vty.command('line vty')
- self.assertEquals(self.vty.node(), 'config-line')
+ self.vty.command('mgcp')
+ self.assertEquals(self.vty.node(), 'config-mgcp')
self.vty.command('nat')
self.assertEquals(self.vty.node(), 'config-nat')
self.vty.command('bsc 0')
- self.vty.command('line vty')
- self.assertEquals(self.vty.node(), 'config-line')
+ self.vty.command('mgcp')
+ self.assertEquals(self.vty.node(), 'config-mgcp')
def testRewriteNoRewrite(self):
self.vty.enable()