From af4518b72882f88a01de0e5c23d423898ba894b4 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Fri, 13 Jun 2014 12:06:07 +0200 Subject: sudorule: Refactor add and remove external_post_callback Reviewed-By: Petr Viktorin --- ipalib/plugins/netgroup.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'ipalib/plugins/netgroup.py') diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index 2d9fdebd0..a7cad1dcb 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -75,6 +75,7 @@ output_params = ( ), ) + @register() class netgroup(LDAPObject): """ @@ -206,7 +207,6 @@ class netgroup(LDAPObject): ) - @register() class netgroup_add(LDAPCreate): __doc__ = _('Add a new netgroup.') @@ -243,7 +243,6 @@ class netgroup_add(LDAPCreate): return dn - @register() class netgroup_del(LDAPDelete): __doc__ = _('Delete a netgroup.') @@ -273,7 +272,6 @@ class netgroup_mod(LDAPUpdate): return dn - @register() class netgroup_find(LDAPSearch): __doc__ = _('Search for a netgroup.') @@ -311,7 +309,6 @@ class netgroup_find(LDAPSearch): return (filter, base_dn, scope) - @register() class netgroup_show(LDAPRetrieve): __doc__ = _('Display information about a netgroup.') @@ -319,21 +316,26 @@ class netgroup_show(LDAPRetrieve): has_output_params = LDAPRetrieve.has_output_params + output_params - @register() class netgroup_add_member(LDAPAddMember): __doc__ = _('Add members to a netgroup.') member_attributes = ['memberuser', 'memberhost', 'member'] has_output_params = LDAPAddMember.has_output_params + output_params + def pre_callback(self, ldap, dn, found, not_found, *keys, **options): assert isinstance(dn, DN) return add_external_pre_callback('host', ldap, dn, keys, options) - def post_callback(self, ldap, completed, failed, dn, entry_attrs, *keys, **options): + def post_callback(self, ldap, completed, failed, dn, entry_attrs, + *keys, **options): assert isinstance(dn, DN) - return add_external_post_callback('memberhost', 'host', 'externalhost', ldap, completed, failed, dn, entry_attrs, keys, options) - + return add_external_post_callback(ldap, dn, entry_attrs, + failed=failed, + completed=completed, + memberattr='memberhost', + membertype='host', + externalattr='externalhost') @register() @@ -342,7 +344,13 @@ class netgroup_remove_member(LDAPRemoveMember): member_attributes = ['memberuser', 'memberhost', 'member'] has_output_params = LDAPRemoveMember.has_output_params + output_params - def post_callback(self, ldap, completed, failed, dn, entry_attrs, *keys, **options): - assert isinstance(dn, DN) - return remove_external_post_callback('memberhost', 'host', 'externalhost', ldap, completed, failed, dn, entry_attrs, keys, options) + def post_callback(self, ldap, completed, failed, dn, entry_attrs, + *keys, **options): + assert isinstance(dn, DN) + return remove_external_post_callback(ldap, dn, entry_attrs, + failed=failed, + completed=completed, + memberattr='memberhost', + membertype='host', + externalattr='externalhost') -- cgit