diff options
author | Pavel Zuna <pzuna@redhat.com> | 2009-07-02 15:17:50 +0200 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-07-02 13:33:05 -0400 |
commit | 537ba4034d6d5af77b13ff0d954247bb39b1fa5a (patch) | |
tree | 5bd5b6c0157faf972cb984f2b64702730cae5a2d /ipalib/plugins/taskgroup.py | |
parent | 5e4c0014df46cd9a00ec8b8099533522cbbc1448 (diff) | |
download | freeipa-537ba4034d6d5af77b13ff0d954247bb39b1fa5a.tar.gz freeipa-537ba4034d6d5af77b13ff0d954247bb39b1fa5a.tar.xz freeipa-537ba4034d6d5af77b13ff0d954247bb39b1fa5a.zip |
Make basegroup-{add, del}-member print failed members with error descriptions.
Diffstat (limited to 'ipalib/plugins/taskgroup.py')
-rw-r--r-- | ipalib/plugins/taskgroup.py | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/ipalib/plugins/taskgroup.py b/ipalib/plugins/taskgroup.py index 380f18618..f46baffc9 100644 --- a/ipalib/plugins/taskgroup.py +++ b/ipalib/plugins/taskgroup.py @@ -111,7 +111,7 @@ class taskgroup_add_member(basegroup_add_member): 'cn', cn, self.filter_class, [''], self.container ) to_add = [] - add_failed = [] + add_failed = {} completed = 0 members = kw.get('groups', []) @@ -141,7 +141,9 @@ class taskgroup_add_member(basegroup_add_member): ldap, completed, to_add, add_failed, dn, 'member' ) - return (completed, ldap.get_entry(dn, _default_attributes)) + return ( + completed, add_failed, ldap.get_entry(dn, _default_attributes) + ) api.register(taskgroup_add_member) @@ -175,37 +177,39 @@ class taskgroup_del_member(basegroup_del_member): 'cn', cn, self.filter_class, [''], self.container ) to_remove = [] - remove_failed = [] + rem_failed = {} completed = 0 members = kw.get('groups', []) - (to_remove, remove_failed) = find_members( - ldap, remove_failed, members, 'cn', 'ipaUserGroup', + (to_remove, rem_failed) = find_members( + ldap, rem_failed, members, 'cn', 'ipaUserGroup', self.api.env.container_group ) - (completed, remove_failed) = del_members( - ldap, completed, to_remove, remove_failed, dn, 'member' + (completed, rem_failed) = del_members( + ldap, completed, to_remove, rem_failed, dn, 'member' ) members = kw.get('hosts', []) - (to_remove, remove_failed) = find_members( - ldap, remove_failed, members, 'cn', 'ipaHost', + (to_remove, rem_failed) = find_members( + ldap, rem_failed, members, 'cn', 'ipaHost', self.api.env.container_host ) - (completed, remove_failed) = del_members( - ldap, completed, to_remove, remove_failed, dn, 'member' + (completed, rem_failed) = del_members( + ldap, completed, to_remove, rem_failed, dn, 'member' ) members = kw.get('rolegroups', []) - (to_remove, remove_failed) = find_members( - ldap, remove_failed, members, 'cn', self.filter_class, + (to_remove, rem_failed) = find_members( + ldap, rem_failed, members, 'cn', self.filter_class, self.api.env.container_rolegroup ) - (completed, remove_failed) = del_members( - ldap, completed, to_remove, remove_failed, dn, 'member' + (completed, rem_failed) = del_members( + ldap, completed, to_remove, rem_failed, dn, 'member' ) - return (completed, ldap.get_entry(dn, _default_attributes)) + return ( + completed, rem_failed, ldap.get_entry(dn, _default_attributes) + ) api.register(taskgroup_del_member) |