diff options
| -rw-r--r-- | ipalib/plugins/basegroup.py | 4 | ||||
| -rw-r--r-- | ipalib/plugins/group.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/hostgroup.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/netgroup.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/rolegroup.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/taskgroup.py | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/ipalib/plugins/basegroup.py b/ipalib/plugins/basegroup.py index 257758738..edcc99992 100644 --- a/ipalib/plugins/basegroup.py +++ b/ipalib/plugins/basegroup.py @@ -463,7 +463,7 @@ class basegroup_add_member(Command): textui.print_count(total, '%i member added.', '%i members added.') -class basegroup_del_member(Command): +class basegroup_remove_member(Command): """ Remove members from group. """ @@ -491,7 +491,7 @@ class basegroup_del_member(Command): def execute(self, cn, **kw): """ - Execute the group-del-member operation. + Execute the group-remove-member operation. Returns a tuple containing the number of members removed and the updated entry. diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index db2462d15..7acb40e49 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -210,14 +210,14 @@ class group_add_member(basegroup_add_member): api.register(group_add_member) -class group_del_member(basegroup_del_member): +class group_remove_member(basegroup_remove_member): """ Remove members from group. """ container = _container_dn def execute(self, cn, **kw): - return super(group_del_member, self).execute(cn, **kw) + return super(group_remove_member, self).execute(cn, **kw) -api.register(group_del_member) +api.register(group_remove_member) diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py index 1147083cd..ec69e6058 100644 --- a/ipalib/plugins/hostgroup.py +++ b/ipalib/plugins/hostgroup.py @@ -173,7 +173,7 @@ class hostgroup_add_member(basegroup_add_member): api.register(hostgroup_add_member) -class hostgroup_del_member(basegroup_del_member): +class hostgroup_remove_member(basegroup_remove_member): """ Remove members from hostgroup. """ @@ -196,7 +196,7 @@ class hostgroup_del_member(basegroup_del_member): def execute(self, cn, **kw): """ - Execute the group-del-member operation. + Execute the group-remove-member operation. Returns a tuple containing the number of members removed and the updated entry. @@ -244,5 +244,5 @@ class hostgroup_del_member(basegroup_del_member): completed, rem_failed, ldap.get_entry(dn, _default_attributes) ) -api.register(hostgroup_del_member) +api.register(hostgroup_remove_member) diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index 76844edb7..9a2d750cb 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -262,7 +262,7 @@ class netgroup_add_member(basegroup_add_member): api.register(netgroup_add_member) -class netgroup_del_member(basegroup_del_member): +class netgroup_remove_member(basegroup_remove_member): """ Remove a member from a netgroup. """ @@ -270,7 +270,7 @@ class netgroup_del_member(basegroup_del_member): container = _container_dn filter_class = _default_class - takes_options = basegroup_del_member.takes_options + ( + takes_options = basegroup_remove_member.takes_options + ( List('hosts?', cli_name='hosts', doc='comma-separated list of hosts to remove' @@ -386,5 +386,5 @@ class netgroup_del_member(basegroup_del_member): completed, rem_failed, ldap.get_entry(dn, _default_attributes) ) -api.register(netgroup_del_member) +api.register(netgroup_remove_member) diff --git a/ipalib/plugins/rolegroup.py b/ipalib/plugins/rolegroup.py index 9b055813e..afa46f73d 100644 --- a/ipalib/plugins/rolegroup.py +++ b/ipalib/plugins/rolegroup.py @@ -112,14 +112,14 @@ class rolegroup_add_member(basegroup_add_member): api.register(rolegroup_add_member) -class rolegroup_del_member(basegroup_del_member): +class rolegroup_remove_member(basegroup_remove_member): """ Remove member from rolegroup. """ container = _container_dn def execute(self, cn, **kw): - return super(rolegroup_del_member, self).execute(cn, **kw) + return super(rolegroup_remove_member, self).execute(cn, **kw) -api.register(rolegroup_del_member) +api.register(rolegroup_remove_member) diff --git a/ipalib/plugins/taskgroup.py b/ipalib/plugins/taskgroup.py index f46baffc9..fcb928e98 100644 --- a/ipalib/plugins/taskgroup.py +++ b/ipalib/plugins/taskgroup.py @@ -148,12 +148,12 @@ class taskgroup_add_member(basegroup_add_member): api.register(taskgroup_add_member) -class taskgroup_del_member(basegroup_del_member): +class taskgroup_remove_member(basegroup_remove_member): """ Remove member from taskgroup. """ container = _container_dn - takes_options = basegroup_del_member.takes_options + ( + takes_options = basegroup_remove_member.takes_options + ( List('rolegroups?', cli_name='rolegroups', doc='comma-separated list of role groups to remove' @@ -211,5 +211,5 @@ class taskgroup_del_member(basegroup_del_member): completed, rem_failed, ldap.get_entry(dn, _default_attributes) ) -api.register(taskgroup_del_member) +api.register(taskgroup_remove_member) |