summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipalib/plugins/aci.py14
-rw-r--r--ipalib/plugins/basegroup.py4
-rw-r--r--ipalib/plugins/config.py2
-rw-r--r--ipalib/plugins/delegation.py8
-rw-r--r--ipalib/plugins/dns.py10
-rw-r--r--ipalib/plugins/group.py14
-rw-r--r--ipalib/plugins/host.py10
-rw-r--r--ipalib/plugins/hostgroup.py14
-rw-r--r--ipalib/plugins/join.py2
-rw-r--r--ipalib/plugins/misc.py2
-rw-r--r--ipalib/plugins/netgroup.py12
-rw-r--r--ipalib/plugins/rolegroup.py14
-rw-r--r--ipalib/plugins/service.py8
-rw-r--r--ipalib/plugins/taskgroup.py8
-rw-r--r--ipalib/plugins/user.py8
15 files changed, 65 insertions, 65 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py
index b83e2031e..4ad30806f 100644
--- a/ipalib/plugins/aci.py
+++ b/ipalib/plugins/aci.py
@@ -43,7 +43,7 @@ def _make_aci(current, aciname, kw):
except errors.NotFound:
# The task group doesn't exist, let's be helpful and add it
tgkw = {'description': aciname}
- (dn, entry_attrs) = api.Command['taskgroup2_create'](
+ (dn, entry_attrs) = api.Command['taskgroup2_add'](
kw['taskgroup'], **tgkw
)
@@ -151,7 +151,7 @@ class aci(Object):
api.register(aci)
-class aci_create(crud.Create):
+class aci_add(crud.Create):
"""
Create new ACI.
"""
@@ -188,10 +188,10 @@ class aci_create(crud.Create):
textui.print_plain(result)
textui.print_dashed('Created ACI "%s".' % aciname)
-api.register(aci_create)
+api.register(aci_add)
-class aci_delete(crud.Delete):
+class aci_del(crud.Delete):
"""
Delete ACI.
"""
@@ -228,7 +228,7 @@ class aci_delete(crud.Delete):
textui.print_name(self.name)
textui.print_plain('Deleted ACI "%s".' % aciname)
-api.register(aci_delete)
+api.register(aci_del)
class aci_mod(crud.Update):
@@ -252,9 +252,9 @@ class aci_mod(crud.Update):
if 'memberof' not in kw and 'filter' not in kw:
kw['filter'] = aci.target['targetfilter']['expression']
- self.api.Command['aci_delete'](aciname)
+ self.api.Command['aci_del'](aciname)
- return self.api.Command['aci_create'](aciname, **kw)
+ return self.api.Command['aci_add'](aciname, **kw)
def output_for_cli(self, textui, result, aciname, **options):
textui.print_name(self.name)
diff --git a/ipalib/plugins/basegroup.py b/ipalib/plugins/basegroup.py
index c5f51c0dd..584a31441 100644
--- a/ipalib/plugins/basegroup.py
+++ b/ipalib/plugins/basegroup.py
@@ -131,7 +131,7 @@ class basegroup(Object):
return ldap.make_dn_from_attr('cn', cn, self.container)
-class basegroup_create(crud.Create):
+class basegroup_add(crud.Create):
"""
Create new group.
"""
@@ -176,7 +176,7 @@ class basegroup_create(crud.Create):
textui.print_dashed('Created group "%s".' % cn)
-class basegroup_delete(crud.Delete):
+class basegroup_del(crud.Delete):
"""
Delete group.
"""
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index c97c57597..5e19dd9be 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-IPA configuration.
+IPA configuration
"""
from ipalib import api, errors
diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py
index d11d1d28d..ee2372179 100644
--- a/ipalib/plugins/delegation.py
+++ b/ipalib/plugins/delegation.py
@@ -52,20 +52,20 @@ class delegation(Object):
api.register(delegation)
-class delegation_create(crud.Create):
+class delegation_add(crud.Create):
"""
Create delegation.
"""
-api.register(delegation_create)
+api.register(delegation_add)
-class delegation_delete(crud.Delete):
+class delegation_del(crud.Delete):
"""
Delete delegation.
"""
-api.register(delegation_delete)
+api.register(delegation_del)
class delegation_mod(crud.Update):
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index bd21ea8c7..8e6cc3c92 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-Domain Name System (DNS) Plugin
+Domain Name System (DNS) plugin
Implements a set of commands useful for manipulating DNS records used by
the BIND LDAP plugin.
@@ -165,7 +165,7 @@ class dns(Object):
api.register(dns)
-class dns_create(crud.Create):
+class dns_add(crud.Create):
"""
Create new DNS zone/SOA record.
"""
@@ -207,10 +207,10 @@ class dns_create(crud.Create):
textui.print_entry(entry_attrs)
textui.print_dashed('Created DNS zone "%s".' % idnsname)
-api.register(dns_create)
+api.register(dns_add)
-class dns_delete(crud.Delete):
+class dns_del(crud.Delete):
"""
Delete existing DNS zone/SOA record.
"""
@@ -244,7 +244,7 @@ class dns_delete(crud.Delete):
textui.print_name(self.name)
textui.print_dashed('Deleted DNS zone "%s".' % args[0])
-api.register(dns_delete)
+api.register(dns_del)
class dns_mod(crud.Update):
diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index b758bef8c..1a5e0ef6f 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-Groups of users.
+Groups of users
"""
from ipalib import api
@@ -46,7 +46,7 @@ class group(basegroup):
api.register(group)
-class group_create(basegroup_create):
+class group_add(basegroup_add):
"""
Create new group.
"""
@@ -82,12 +82,12 @@ class group_create(basegroup_create):
if kw['posix'] or 'gidnumber' in kw:
kw['objectclass'].append('posixgroup')
- return super(group_create, self).execute(cn, **kw)
+ return super(group_add, self).execute(cn, **kw)
-api.register(group_create)
+api.register(group_add)
-class group_delete(basegroup_delete):
+class group_del(basegroup_del):
"""
Delete group.
"""
@@ -119,9 +119,9 @@ class group_delete(basegroup_delete):
except errors.NotFound:
pass
- return super(group_delete, self).execute(cn, **kw)
+ return super(group_del, self).execute(cn, **kw)
-api.register(group_delete)
+api.register(group_del)
class group_mod(basegroup_mod):
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index 3fb211bef..9d8df1dbf 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -122,7 +122,7 @@ class host(Object):
api.register(host)
-class host_create(crud.Create):
+class host_add(crud.Create):
"""
Create new host.
"""
@@ -192,10 +192,10 @@ class host_create(crud.Create):
textui.print_entry(entry_attrs)
textui.print_dashed('Created host "%s".' % hostname)
-api.register(host_create)
+api.register(host_add)
-class host_delete(crud.Delete):
+class host_del(crud.Delete):
"""
Delete host.
"""
@@ -215,7 +215,7 @@ class host_delete(crud.Delete):
services = api.Command['service2_find'](hostname)
for (dn, entry_attrs) in services:
principal = entry_attrs['krbprincipalname']
- api.Command['service2_delete'](principal)
+ api.Command['service2_del'](principal)
ldap.delete_entry(dn)
@@ -228,7 +228,7 @@ class host_delete(crud.Delete):
textui.print_name(self.name)
textui.print_dashed('Deleted host "%s".' % hostname)
-api.register(host_delete)
+api.register(host_del)
class host_mod(crud.Update):
diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py
index 838e1f29b..f2966e3c1 100644
--- a/ipalib/plugins/hostgroup.py
+++ b/ipalib/plugins/hostgroup.py
@@ -38,28 +38,28 @@ class hostgroup(basegroup):
api.register(hostgroup)
-class hostgroup_create(basegroup_create):
+class hostgroup_add(basegroup_add):
"""
Create a new hostgroup.
"""
- base_classes = basegroup_create.base_classes + (_default_class, )
+ base_classes = basegroup_add.base_classes + (_default_class, )
def execute(self, cn, **kw):
- return super(hostgroup_create, self).execute(cn, **kw)
+ return super(hostgroup_add, self).execute(cn, **kw)
-api.register(hostgroup_create)
+api.register(hostgroup_add)
-class hostgroup_delete(basegroup_delete):
+class hostgroup_del(basegroup_del):
"""
Delete an existing hostgroup.
"""
container = _container_dn
def execute(self, cn, **kw):
- return super(hostgroup_delete, self).execute(cn, **kw)
+ return super(hostgroup_del, self).execute(cn, **kw)
-api.register(hostgroup_delete)
+api.register(hostgroup_del)
class hostgroup_mod(basegroup_mod):
diff --git a/ipalib/plugins/join.py b/ipalib/plugins/join.py
index b6aac6661..ab029e43c 100644
--- a/ipalib/plugins/join.py
+++ b/ipalib/plugins/join.py
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-join a machine to the IPA domain
+Joining an IPA domain
"""
from ipalib import api, util
diff --git a/ipalib/plugins/misc.py b/ipalib/plugins/misc.py
index a2f0fa4e4..2dcc6554c 100644
--- a/ipalib/plugins/misc.py
+++ b/ipalib/plugins/misc.py
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-Misc frontend plugins.
+Misc plugins
"""
import re
diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py
index 088462154..28b275956 100644
--- a/ipalib/plugins/netgroup.py
+++ b/ipalib/plugins/netgroup.py
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-Netgroups.
+Netgroups
"""
from ipalib import api
@@ -41,7 +41,7 @@ class netgroup(basegroup):
api.register(netgroup)
-class netgroup_create(basegroup_create):
+class netgroup_add(basegroup_add):
"""
Create new netgroup.
"""
@@ -79,10 +79,10 @@ class netgroup_create(basegroup_create):
return ldap.get_entry(dn, _default_attributes)
-api.register(netgroup_create)
+api.register(netgroup_add)
-class netgroup_delete(basegroup_delete):
+class netgroup_del(basegroup_del):
"""
Delete netgroup.
"""
@@ -90,9 +90,9 @@ class netgroup_delete(basegroup_delete):
filter_class = _default_class
def execute(self, cn, **kw):
- return super(netgroup_delete, self).execute(cn, **kw)
+ return super(netgroup_del, self).execute(cn, **kw)
-api.register(netgroup_delete)
+api.register(netgroup_del)
class netgroup_mod(basegroup_mod):
diff --git a/ipalib/plugins/rolegroup.py b/ipalib/plugins/rolegroup.py
index 1182c67b0..9b055813e 100644
--- a/ipalib/plugins/rolegroup.py
+++ b/ipalib/plugins/rolegroup.py
@@ -39,28 +39,28 @@ class rolegroup(basegroup):
api.register(rolegroup)
-class rolegroup_create(basegroup_create):
+class rolegroup_add(basegroup_add):
"""
Create new rolegroup.
"""
- base_classes = basegroup_create.base_classes + (_default_class, )
+ base_classes = basegroup_add.base_classes + (_default_class, )
def execute(self, cn, **kw):
- return super(rolegroup_create, self).execute(cn, **kw)
+ return super(rolegroup_add, self).execute(cn, **kw)
-api.register(rolegroup_create)
+api.register(rolegroup_add)
-class rolegroup_delete(basegroup_delete):
+class rolegroup_del(basegroup_del):
"""
Delete rolegroup.
"""
container = _container_dn
def execute(self, cn, **kw):
- return super(rolegroup_delete, self).execute(cn, **kw)
+ return super(rolegroup_del, self).execute(cn, **kw)
-api.register(rolegroup_delete)
+api.register(rolegroup_del)
class rolegroup_mod(basegroup_mod):
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py
index 3245b7f92..81d71ee47 100644
--- a/ipalib/plugins/service.py
+++ b/ipalib/plugins/service.py
@@ -102,7 +102,7 @@ class service(Object):
api.register(service)
-class service_create(crud.Create):
+class service_add(crud.Create):
"""
Add new service.
"""
@@ -168,10 +168,10 @@ class service_create(crud.Create):
textui.print_entry(entry_attrs)
textui.print_dashed('Created service "%s".' % principal)
-api.register(service_create)
+api.register(service_add)
-class service_delete(crud.Delete):
+class service_del(crud.Delete):
"""
Delete an existing service.
"""
@@ -206,7 +206,7 @@ class service_delete(crud.Delete):
textui.print_name(self.name)
textui.print_dashed('Deleted service "%s".' % principal)
-api.register(service_delete)
+api.register(service_del)
class service_mod(crud.Update):
diff --git a/ipalib/plugins/taskgroup.py b/ipalib/plugins/taskgroup.py
index cba0b4c9e..d22ac8229 100644
--- a/ipalib/plugins/taskgroup.py
+++ b/ipalib/plugins/taskgroup.py
@@ -37,21 +37,21 @@ class taskgroup(basegroup):
api.register(taskgroup)
-class taskgroup_create(basegroup_create):
+class taskgroup_add(basegroup_add):
"""
Create new taskgroup.
"""
-api.register(taskgroup_create)
+api.register(taskgroup_add)
-class taskgroup_delete(basegroup_delete):
+class taskgroup_del(basegroup_del):
"""
Delete taskgroup.
"""
container = _container_dn
-api.register(taskgroup_delete)
+api.register(taskgroup_del)
class taskgroup_mod(basegroup_mod):
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 1e49ca832..c5c99b65c 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -95,7 +95,7 @@ class user(Object):
api.register(user)
-class user_create(crud.Create):
+class user_add(crud.Create):
"""
Create new user.
"""
@@ -169,10 +169,10 @@ class user_create(crud.Create):
textui.print_entry(entry_attrs)
textui.print_dashed('Created user "%s".' % uid)
-api.register(user_create)
+api.register(user_add)
-class user_delete(crud.Delete):
+class user_del(crud.Delete):
"""
Delete user.
"""
@@ -201,7 +201,7 @@ class user_delete(crud.Delete):
textui.print_name(self.name)
textui.print_dashed('Deleted user "%s".' % uid)
-api.register(user_delete)
+api.register(user_del)
class user_mod(crud.Update):