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.
This commit is contained in:
parent
bf8eec7ea2
commit
cdf18572bf
|
@ -152,7 +152,7 @@ static int config_write_nat(struct vty *vty)
|
||||||
llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
|
llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
|
||||||
write_pgroup_lst(vty, pgroup);
|
write_pgroup_lst(vty, pgroup);
|
||||||
if (_nat->mgcp_ipa)
|
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;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -754,9 +754,9 @@ DEFUN(cfg_nat_ussd_local,
|
||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFUN(cfg_nat_mgcp_ipa,
|
DEFUN(cfg_nat_use_ipa_for_mgcp,
|
||||||
cfg_nat_mgcp_ipa_cmd,
|
cfg_nat_use_ipa_for_mgcp_cmd,
|
||||||
"mgcp-through-msc-ipa",
|
"use-msc-ipa-for-mgcp",
|
||||||
"This needs to be set at start. Handle MGCP messages through "
|
"This needs to be set at start. Handle MGCP messages through "
|
||||||
"the IPA protocol and not through the UDP socket.\n")
|
"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_query_cmd);
|
||||||
install_element(NAT_NODE, &cfg_nat_ussd_token_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_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 */
|
/* access-list */
|
||||||
install_element(NAT_NODE, &cfg_lst_imsi_allow_cmd);
|
install_element(NAT_NODE, &cfg_lst_imsi_allow_cmd);
|
||||||
|
|
|
@ -264,13 +264,13 @@ class TestVTYNAT(TestVTYGenericBSC):
|
||||||
self.vty.command('mgcp')
|
self.vty.command('mgcp')
|
||||||
self.vty.command('nat')
|
self.vty.command('nat')
|
||||||
self.assertEquals(self.vty.node(), 'config-nat')
|
self.assertEquals(self.vty.node(), 'config-nat')
|
||||||
self.vty.command('line vty')
|
self.vty.command('mgcp')
|
||||||
self.assertEquals(self.vty.node(), 'config-line')
|
self.assertEquals(self.vty.node(), 'config-mgcp')
|
||||||
self.vty.command('nat')
|
self.vty.command('nat')
|
||||||
self.assertEquals(self.vty.node(), 'config-nat')
|
self.assertEquals(self.vty.node(), 'config-nat')
|
||||||
self.vty.command('bsc 0')
|
self.vty.command('bsc 0')
|
||||||
self.vty.command('line vty')
|
self.vty.command('mgcp')
|
||||||
self.assertEquals(self.vty.node(), 'config-line')
|
self.assertEquals(self.vty.node(), 'config-mgcp')
|
||||||
|
|
||||||
def testRewriteNoRewrite(self):
|
def testRewriteNoRewrite(self):
|
||||||
self.vty.enable()
|
self.vty.enable()
|
||||||
|
|
Loading…
Reference in New Issue