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

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 authored and Petr Viktorin committed 2014-09-17 09:36:27 +02:00
1 parent 9ca5a4e420
commit 1f8f762b84
3 files changed
+4 -6

No files matched your search

+2 -1
View File
@@ -1819,8 +1819,9 @@ output: Output('completed', <type 'int'>, None)
output: Output('failed', <type 'dict'>, None)
output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
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)
option: Flag('continue', autofill=True, cli_name='continue', default=False)
option: Flag('updatedns?', autofill=True, default=False)
option: Str('version?', exclude='webui')
output: Output('result', <type 'dict'>, None)
+1 -1
View File
@@ -642,7 +642,7 @@ class host_del(LDAPDelete):
msg_summary = _('Deleted host "%(value)s"')
member_attributes = ['managedby']
takes_options = (
takes_options = LDAPDelete.takes_options + (
Flag('updatedns?',
doc=_('Remove entries from DNS'),
default=False,
+1 -4
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):
cleanup_commands = [
('host_del', [fqdn1], {}),
('host_del', [fqdn2], {}),
('host_del', [fqdn3], {}),
('host_del', [fqdn4], {}),
('host_del', [fqdn1, fqdn2, fqdn3, fqdn4], {'continue': True}),
('service_del', [service1], {}),
]