IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipalib: host_del: Extend LDAPDelete's takes_options instead of overriding

Browse Source 
The host-del command did not accept --continue option, since the
takes_options was overriden and did not take the options from LDAPDelete.

Fix the behaviour.

https://fedorahosted.org/freeipa/ticket/4473

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Tomas Babej 2014-08-05 09:12:24 +02:00 committed by Petr Viktorin
parent a0e23ce210
commit adc4abcbe3
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
API.txt
View File

@ -1819,8 +1819,9 @@ output: Output('completed', <type 'int'>, None)
output: Output('failed', <type 'dict'>, None) output: Output('failed', <type 'dict'>, None)
output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
command: host_del command: host_del
args: 1,2,3 args: 1,3,3
arg: Str('fqdn', attribute=True, cli_name='hostname', multivalue=True, primary_key=True, query=True, required=True) arg: Str('fqdn', attribute=True, cli_name='hostname', multivalue=True, primary_key=True, query=True, required=True)
option: Flag('continue', autofill=True, cli_name='continue', default=False)
option: Flag('updatedns?', autofill=True, default=False) option: Flag('updatedns?', autofill=True, default=False)
option: Str('version?', exclude='webui') option: Str('version?', exclude='webui')
output: Output('result', <type 'dict'>, None) output: Output('result', <type 'dict'>, None)

2
ipalib/plugins/host.py
View File

@ -642,7 +642,7 @@ class host_del(LDAPDelete):
msg_summary = _('Deleted host "%(value)s"') msg_summary = _('Deleted host "%(value)s"')
member_attributes = ['managedby'] member_attributes = ['managedby']
takes_options = ( takes_options = LDAPDelete.takes_options + (
Flag('updatedns?', Flag('updatedns?',
doc=_('Remove entries from DNS'), doc=_('Remove entries from DNS'),
default=False, default=False,

5
ipatests/test_xmlrpc/test_host_plugin.py
View File

@ -139,10 +139,7 @@ sshpubkeyfp = u'13:67:6B:BF:4E:A2:05:8E:AE:25:8B:A1:31:DE:6F:1B public key test
class test_host(Declarative): class test_host(Declarative):
cleanup_commands = [ cleanup_commands = [
('host_del', [fqdn1], {}), ('host_del', [fqdn1, fqdn2, fqdn3, fqdn4], {'continue': True}),
('host_del', [fqdn2], {}),
('host_del', [fqdn3], {}),
('host_del', [fqdn4], {}),
('service_del', [service1], {}), ('service_del', [service1], {}),
] ]