mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-01-23 23:03:19 -06:00
Rename plugins2 to plugins.
This commit is contained in:
Pavel Zuna
Rob Crittenden
parent
e1e1db9c9f
commit
b6cfae46e4
@ -101,7 +101,7 @@ def _normalize_permissions(permissions):
|
||||
return ','.join(valid_permissions)
|
||||
|
||||
|
||||
class aci2(Object):
|
||||
class aci(Object):
|
||||
"""
|
||||
ACI object.
|
||||
"""
|
||||
@ -148,10 +148,10 @@ class aci2(Object):
|
||||
),
|
||||
)
|
||||
|
||||
api.register(aci2)
|
||||
api.register(aci)
|
||||
|
||||
|
||||
class aci2_create(crud.Create):
|
||||
class aci_create(crud.Create):
|
||||
"""
|
||||
Create new ACI.
|
||||
"""
|
||||
@ -188,10 +188,10 @@ class aci2_create(crud.Create):
|
||||
textui.print_plain(result)
|
||||
textui.print_dashed('Created ACI "%s".' % aciname)
|
||||
|
||||
api.register(aci2_create)
|
||||
api.register(aci_create)
|
||||
|
||||
|
||||
class aci2_delete(crud.Delete):
|
||||
class aci_delete(crud.Delete):
|
||||
"""
|
||||
Delete ACI.
|
||||
"""
|
||||
@ -228,10 +228,10 @@ class aci2_delete(crud.Delete):
|
||||
textui.print_name(self.name)
|
||||
textui.print_plain('Deleted ACI "%s".' % aciname)
|
||||
|
||||
api.register(aci2_delete)
|
||||
api.register(aci_delete)
|
||||
|
||||
|
||||
class aci2_mod(crud.Update):
|
||||
class aci_mod(crud.Update):
|
||||
"""
|
||||
Modify ACI.
|
||||
"""
|
||||
@ -252,19 +252,19 @@ class aci2_mod(crud.Update):
|
||||
if 'memberof' not in kw and 'filter' not in kw:
|
||||
kw['filter'] = aci.target['targetfilter']['expression']
|
||||
|
||||
self.api.Command['aci2_delete'](aciname)
|
||||
self.api.Command['aci_delete'](aciname)
|
||||
|
||||
return self.api.Command['aci2_create'](aciname, **kw)
|
||||
return self.api.Command['aci_create'](aciname, **kw)
|
||||
|
||||
def output_for_cli(self, textui, result, aciname, **options):
|
||||
textui.print_name(self.name)
|
||||
textui.print_plain(result)
|
||||
textui.print_dashed('Modified ACI "%s".' % aciname)
|
||||
|
||||
api.register(aci2_mod)
|
||||
api.register(aci_mod)
|
||||
|
||||
|
||||
class aci2_find(crud.Search):
|
||||
class aci_find(crud.Search):
|
||||
"""
|
||||
Search for ACIs.
|
||||
"""
|
||||
@ -354,10 +354,10 @@ class aci2_find(crud.Search):
|
||||
len(result), '%i ACI matched.', '%i ACIs matched.'
|
||||
)
|
||||
|
||||
api.register(aci2_find)
|
||||
api.register(aci_find)
|
||||
|
||||
|
||||
class aci2_show(crud.Retrieve):
|
||||
class aci_show(crud.Retrieve):
|
||||
"""
|
||||
Display ACI.
|
||||
"""
|
||||
@ -382,5 +382,5 @@ class aci2_show(crud.Retrieve):
|
||||
textui.print_name(self.name)
|
||||
textui.print_plain(result)
|
||||
|
||||
api.register(aci2_show)
|
||||
api.register(aci_show)
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@ def del_members(ldap, completed, members, rem_failed, group_dn, memberattr):
|
||||
return (completed, rem_failed)
|
||||
|
||||
|
||||
class basegroup2(Object):
|
||||
class basegroup(Object):
|
||||
"""
|
||||
Basic Group object.
|
||||
"""
|
||||
@ -131,7 +131,7 @@ class basegroup2(Object):
|
||||
return ldap.make_dn_from_attr('cn', cn, self.container)
|
||||
|
||||
|
||||
class basegroup2_create(crud.Create):
|
||||
class basegroup_create(crud.Create):
|
||||
"""
|
||||
Create new group.
|
||||
"""
|
||||
@ -176,7 +176,7 @@ class basegroup2_create(crud.Create):
|
||||
textui.print_dashed('Created group "%s".' % cn)
|
||||
|
||||
|
||||
class basegroup2_delete(crud.Delete):
|
||||
class basegroup_delete(crud.Delete):
|
||||
"""
|
||||
Delete group.
|
||||
"""
|
||||
@ -212,7 +212,7 @@ class basegroup2_delete(crud.Delete):
|
||||
textui.print_dashed('Deleted group "%s"' % cn)
|
||||
|
||||
|
||||
class basegroup2_mod(crud.Update):
|
||||
class basegroup_mod(crud.Update):
|
||||
"""
|
||||
Modify group.
|
||||
"""
|
||||
@ -261,7 +261,7 @@ class basegroup2_mod(crud.Update):
|
||||
textui.print_dashed('Modified group "%s"' % cn)
|
||||
|
||||
|
||||
class basegroup2_find(crud.Search):
|
||||
class basegroup_find(crud.Search):
|
||||
"""
|
||||
Search for groups.
|
||||
"""
|
||||
@ -333,7 +333,7 @@ class basegroup2_find(crud.Search):
|
||||
)
|
||||
|
||||
|
||||
class basegroup2_show(crud.Retrieve):
|
||||
class basegroup_show(crud.Retrieve):
|
||||
"""
|
||||
Display group.
|
||||
"""
|
||||
@ -381,7 +381,7 @@ class basegroup2_show(crud.Retrieve):
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
|
||||
class basegroup2_add_member(Command):
|
||||
class basegroup_add_member(Command):
|
||||
"""
|
||||
Add members to group.
|
||||
"""
|
||||
@ -460,7 +460,7 @@ class basegroup2_add_member(Command):
|
||||
textui.print_count(total, '%i member added.', '%i members added.')
|
||||
|
||||
|
||||
class basegroup2_del_member(Command):
|
||||
class basegroup_del_member(Command):
|
||||
"""
|
||||
Remove members from group.
|
||||
"""
|
||||
|
||||
@ -25,34 +25,34 @@ the BIND LDAP plugin.
|
||||
EXAMPLES:
|
||||
|
||||
Add new zone;
|
||||
ipa dns2-create example.com nameserver.example.com admin@example.com
|
||||
ipa dns-create example.com nameserver.example.com admin@example.com
|
||||
|
||||
Add second nameserver for example.com:
|
||||
ipa dns2-add-rr example.com @ NS nameserver2.example.com
|
||||
ipa dns-add-rr example.com @ NS nameserver2.example.com
|
||||
|
||||
Delete previously added nameserver from example.com:
|
||||
ipa dns2-del-rr example.com @ NS nameserver2.example.com
|
||||
ipa dns-del-rr example.com @ NS nameserver2.example.com
|
||||
|
||||
Add new A record for www.example.com: (random IP)
|
||||
ipa dns2-add-rr example.com www A 80.142.15.2
|
||||
ipa dns-add-rr example.com www A 80.142.15.2
|
||||
|
||||
Show zone example.com:
|
||||
ipa dns2-show example.com
|
||||
ipa dns-show example.com
|
||||
|
||||
Find zone with 'example' in it's domain name:
|
||||
ipa dns2-find example
|
||||
ipa dns-find example
|
||||
|
||||
Find records for resources with 'www' in their name in zone example.com:
|
||||
ipa dns2-find-rr example.com www
|
||||
ipa dns-find-rr example.com www
|
||||
|
||||
Find A records for resource www in zone example.com
|
||||
ipa dns2-find-rr example.com --resource www --type A
|
||||
ipa dns-find-rr example.com --resource www --type A
|
||||
|
||||
Show records for resource www in zone example.com
|
||||
ipa dns2-show-rr example.com www
|
||||
ipa dns-show-rr example.com www
|
||||
|
||||
Delete zone example.com with all resource records:
|
||||
ipa dns2-delete example.com
|
||||
ipa dns-delete example.com
|
||||
"""
|
||||
|
||||
# A few notes about the LDAP schema to make this plugin more understandable:
|
||||
@ -107,7 +107,7 @@ def _get_record_dn(ldap, zone, idnsname):
|
||||
return ldap.make_dn_from_rdn(rdn, parent_dn)
|
||||
|
||||
|
||||
class dns2(Object):
|
||||
class dns(Object):
|
||||
"""DNS zone/SOA record object."""
|
||||
|
||||
takes_params = (
|
||||
@ -162,10 +162,10 @@ class dns2(Object):
|
||||
),
|
||||
)
|
||||
|
||||
api.register(dns2)
|
||||
api.register(dns)
|
||||
|
||||
|
||||
class dns2_create(crud.Create):
|
||||
class dns_create(crud.Create):
|
||||
"""
|
||||
Create new DNS zone/SOA record.
|
||||
"""
|
||||
@ -207,10 +207,10 @@ class dns2_create(crud.Create):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Created DNS zone "%s".' % idnsname)
|
||||
|
||||
api.register(dns2_create)
|
||||
api.register(dns_create)
|
||||
|
||||
|
||||
class dns2_delete(crud.Delete):
|
||||
class dns_delete(crud.Delete):
|
||||
"""
|
||||
Delete existing DNS zone/SOA record.
|
||||
"""
|
||||
@ -244,10 +244,10 @@ class dns2_delete(crud.Delete):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Deleted DNS zone "%s".' % args[0])
|
||||
|
||||
api.register(dns2_delete)
|
||||
api.register(dns_delete)
|
||||
|
||||
|
||||
class dns2_mod(crud.Update):
|
||||
class dns_mod(crud.Update):
|
||||
"""
|
||||
Modify DNS zone/SOA record.
|
||||
"""
|
||||
@ -279,10 +279,10 @@ class dns2_mod(crud.Update):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Modified DNS zone "%s".' % idnsname)
|
||||
|
||||
api.register(dns2_mod)
|
||||
api.register(dns_mod)
|
||||
|
||||
|
||||
class dns2_find(crud.Search):
|
||||
class dns_find(crud.Search):
|
||||
"""
|
||||
Search for DNS zones/SOA records.
|
||||
"""
|
||||
@ -332,10 +332,10 @@ class dns2_find(crud.Search):
|
||||
'Please refine your search and try again.', above=False
|
||||
)
|
||||
|
||||
api.register(dns2_find)
|
||||
api.register(dns_find)
|
||||
|
||||
|
||||
class dns2_show(crud.Retrieve):
|
||||
class dns_show(crud.Retrieve):
|
||||
"""
|
||||
Display DNS zone/SOA record.
|
||||
"""
|
||||
@ -367,10 +367,10 @@ class dns2_show(crud.Retrieve):
|
||||
textui.print_attribute('dn', dn)
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
api.register(dns2_show)
|
||||
api.register(dns_show)
|
||||
|
||||
|
||||
class dns2_enable(Command):
|
||||
class dns_enable(Command):
|
||||
"""
|
||||
Activate DNS zone.
|
||||
"""
|
||||
@ -402,10 +402,10 @@ class dns2_enable(Command):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Activated DNS zone "%s".' % zone)
|
||||
|
||||
api.register(dns2_enable)
|
||||
api.register(dns_enable)
|
||||
|
||||
|
||||
class dns2_disable(Command):
|
||||
class dns_disable(Command):
|
||||
"""
|
||||
Deactivate DNS zone.
|
||||
"""
|
||||
@ -437,10 +437,10 @@ class dns2_disable(Command):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Deactivated DNS zone "%s".' % zone)
|
||||
|
||||
api.register(dns2_disable)
|
||||
api.register(dns_disable)
|
||||
|
||||
|
||||
class dns2_add_rr(Command):
|
||||
class dns_add_rr(Command):
|
||||
"""
|
||||
Add new DNS resource record.
|
||||
"""
|
||||
@ -545,10 +545,10 @@ class dns2_add_rr(Command):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Added DNS resource record %s.' % output)
|
||||
|
||||
api.register(dns2_add_rr)
|
||||
api.register(dns_add_rr)
|
||||
|
||||
|
||||
class dns2_del_rr(Command):
|
||||
class dns_del_rr(Command):
|
||||
"""
|
||||
Delete DNS resource record.
|
||||
"""
|
||||
@ -627,10 +627,10 @@ class dns2_del_rr(Command):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Deleted DNS resource record %s' % output)
|
||||
|
||||
api.register(dns2_del_rr)
|
||||
api.register(dns_del_rr)
|
||||
|
||||
|
||||
class dns2_find_rr(Command):
|
||||
class dns_find_rr(Command):
|
||||
"""
|
||||
Search for DNS resource records.
|
||||
"""
|
||||
@ -750,10 +750,10 @@ class dns2_find_rr(Command):
|
||||
'Please refine your search and try again.', above=False
|
||||
)
|
||||
|
||||
api.register(dns2_find_rr)
|
||||
api.register(dns_find_rr)
|
||||
|
||||
|
||||
class dns2_show_rr(Command):
|
||||
class dns_show_rr(Command):
|
||||
"""
|
||||
Show existing DNS resource records.
|
||||
"""
|
||||
@ -799,5 +799,5 @@ class dns2_show_rr(Command):
|
||||
textui.print_attribute('dn', dn)
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
api.register(dns2_show_rr)
|
||||
api.register(dns_show_rr)
|
||||
|
||||
|
||||
@ -23,30 +23,30 @@ Groups of users.
|
||||
"""
|
||||
|
||||
from ipalib import api
|
||||
from ipalib.plugins.basegroup2 import *
|
||||
from ipalib.plugins.basegroup import *
|
||||
|
||||
_container_dn = api.env.container_group
|
||||
_default_attributes = ['cn', 'description', 'gidnumber', 'member', 'memberof']
|
||||
_default_class = 'ipausergroup'
|
||||
|
||||
|
||||
class group2(basegroup2):
|
||||
class group(basegroup):
|
||||
"""
|
||||
Group object.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
takes_params = basegroup2.takes_params + (
|
||||
takes_params = basegroup.takes_params + (
|
||||
Int('gidnumber?',
|
||||
cli_name='gid',
|
||||
doc='GID (use this option to set it manually)',
|
||||
),
|
||||
)
|
||||
|
||||
api.register(group2)
|
||||
api.register(group)
|
||||
|
||||
|
||||
class group2_create(basegroup2_create):
|
||||
class group_create(basegroup_create):
|
||||
"""
|
||||
Create new group.
|
||||
"""
|
||||
@ -82,12 +82,12 @@ class group2_create(basegroup2_create):
|
||||
if kw['posix'] or 'gidnumber' in kw:
|
||||
kw['objectclass'].append('posixgroup')
|
||||
|
||||
return super(group2_create, self).execute(cn, **kw)
|
||||
return super(group_create, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_create)
|
||||
api.register(group_create)
|
||||
|
||||
|
||||
class group2_delete(basegroup2_delete):
|
||||
class group_delete(basegroup_delete):
|
||||
"""
|
||||
Delete group.
|
||||
"""
|
||||
@ -119,12 +119,12 @@ class group2_delete(basegroup2_delete):
|
||||
except errors.NotFound:
|
||||
pass
|
||||
|
||||
return super(group2_delete, self).execute(cn, **kw)
|
||||
return super(group_delete, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_delete)
|
||||
api.register(group_delete)
|
||||
|
||||
|
||||
class group2_mod(basegroup2_mod):
|
||||
class group_mod(basegroup_mod):
|
||||
"""
|
||||
Modify group.
|
||||
"""
|
||||
@ -163,12 +163,12 @@ class group2_mod(basegroup2_mod):
|
||||
entry_attrs['objectclass'].append('posixgroup')
|
||||
kw['objectclass'] = entry_attrs['objectclass']
|
||||
|
||||
return super(group2_mod, self).execute(cn, **kw)
|
||||
return super(group_mod, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_mod)
|
||||
api.register(group_mod)
|
||||
|
||||
|
||||
class group2_find(basegroup2_find):
|
||||
class group_find(basegroup_find):
|
||||
"""
|
||||
Search for groups.
|
||||
"""
|
||||
@ -177,12 +177,12 @@ class group2_find(basegroup2_find):
|
||||
filter_class = _default_class
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(group2_find, self).execute(cn, **kw)
|
||||
return super(group_find, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_find)
|
||||
api.register(group_find)
|
||||
|
||||
|
||||
class group2_show(basegroup2_show):
|
||||
class group_show(basegroup_show):
|
||||
"""
|
||||
Display group.
|
||||
"""
|
||||
@ -190,31 +190,31 @@ class group2_show(basegroup2_show):
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(group2_show, self).execute(cn, **kw)
|
||||
return super(group_show, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_show)
|
||||
api.register(group_show)
|
||||
|
||||
|
||||
class group2_add_member(basegroup2_add_member):
|
||||
class group_add_member(basegroup_add_member):
|
||||
"""
|
||||
Add members to group.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(group2_add_member, self).execute(cn, **kw)
|
||||
return super(group_add_member, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_add_member)
|
||||
api.register(group_add_member)
|
||||
|
||||
|
||||
class group2_del_member(basegroup2_del_member):
|
||||
class group_del_member(basegroup_del_member):
|
||||
"""
|
||||
Remove members from group.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(group2_del_member, self).execute(cn, **kw)
|
||||
return super(group_del_member, self).execute(cn, **kw)
|
||||
|
||||
api.register(group2_del_member)
|
||||
api.register(group_del_member)
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ def determine_platform():
|
||||
return unicode(machine)
|
||||
|
||||
|
||||
class host2(Object):
|
||||
class host(Object):
|
||||
"""
|
||||
Host object.
|
||||
"""
|
||||
@ -119,10 +119,10 @@ class host2(Object):
|
||||
),
|
||||
)
|
||||
|
||||
api.register(host2)
|
||||
api.register(host)
|
||||
|
||||
|
||||
class host2_create(crud.Create):
|
||||
class host_create(crud.Create):
|
||||
"""
|
||||
Create new host.
|
||||
"""
|
||||
@ -192,10 +192,10 @@ class host2_create(crud.Create):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Created host "%s".' % hostname)
|
||||
|
||||
api.register(host2_create)
|
||||
api.register(host_create)
|
||||
|
||||
|
||||
class host2_delete(crud.Delete):
|
||||
class host_delete(crud.Delete):
|
||||
"""
|
||||
Delete host.
|
||||
"""
|
||||
@ -228,10 +228,10 @@ class host2_delete(crud.Delete):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Deleted host "%s".' % hostname)
|
||||
|
||||
api.register(host2_delete)
|
||||
api.register(host_delete)
|
||||
|
||||
|
||||
class host2_mod(crud.Update):
|
||||
class host_mod(crud.Update):
|
||||
"""
|
||||
Modify host.
|
||||
"""
|
||||
@ -272,10 +272,10 @@ class host2_mod(crud.Update):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Modified host "%s".' % hostname)
|
||||
|
||||
api.register(host2_mod)
|
||||
api.register(host_mod)
|
||||
|
||||
|
||||
class host2_find(crud.Search):
|
||||
class host_find(crud.Search):
|
||||
"""
|
||||
Search for hosts.
|
||||
"""
|
||||
@ -329,10 +329,10 @@ class host2_find(crud.Search):
|
||||
'Please refine your search and try again.', above=False
|
||||
)
|
||||
|
||||
api.register(host2_find)
|
||||
api.register(host_find)
|
||||
|
||||
|
||||
class host2_show(crud.Retrieve):
|
||||
class host_show(crud.Retrieve):
|
||||
"""
|
||||
Display host.
|
||||
"""
|
||||
@ -371,5 +371,5 @@ class host2_show(crud.Retrieve):
|
||||
textui.print_attribute('dn', dn)
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
api.register(host2_show)
|
||||
api.register(host_show)
|
||||
|
||||
|
||||
@ -22,83 +22,83 @@ Groups of hosts.
|
||||
"""
|
||||
|
||||
from ipalib import api
|
||||
from ipalib.plugins.basegroup2 import *
|
||||
from ipalib.plugins.basegroup import *
|
||||
|
||||
_container_dn = api.env.container_hostgroup
|
||||
_default_attributes = ['cn', 'description', 'member', 'memberof']
|
||||
_default_class = 'ipahostgroup'
|
||||
|
||||
|
||||
class hostgroup2(basegroup2):
|
||||
class hostgroup(basegroup):
|
||||
"""
|
||||
Hostgroup object.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(hostgroup2)
|
||||
api.register(hostgroup)
|
||||
|
||||
|
||||
class hostgroup2_create(basegroup2_create):
|
||||
class hostgroup_create(basegroup_create):
|
||||
"""
|
||||
Create a new hostgroup.
|
||||
"""
|
||||
base_classes = basegroup2_create.base_classes + (_default_class, )
|
||||
base_classes = basegroup_create.base_classes + (_default_class, )
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(hostgroup2_create, self).execute(cn, **kw)
|
||||
return super(hostgroup_create, self).execute(cn, **kw)
|
||||
|
||||
api.register(hostgroup2_create)
|
||||
api.register(hostgroup_create)
|
||||
|
||||
|
||||
class hostgroup2_delete(basegroup2_delete):
|
||||
class hostgroup_delete(basegroup_delete):
|
||||
"""
|
||||
Delete an existing hostgroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(hostgroup2_delete, self).execute(cn, **kw)
|
||||
return super(hostgroup_delete, self).execute(cn, **kw)
|
||||
|
||||
api.register(hostgroup2_delete)
|
||||
api.register(hostgroup_delete)
|
||||
|
||||
|
||||
class hostgroup2_mod(basegroup2_mod):
|
||||
class hostgroup_mod(basegroup_mod):
|
||||
"""
|
||||
Edit an existing hostgroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(hostgroup2_mod, self).execute(cn, **kw)
|
||||
return super(hostgroup_mod, self).execute(cn, **kw)
|
||||
|
||||
api.register(hostgroup2_mod)
|
||||
api.register(hostgroup_mod)
|
||||
|
||||
|
||||
class hostgroup2_find(basegroup2_find):
|
||||
class hostgroup_find(basegroup_find):
|
||||
"""
|
||||
Search the groups.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(hostgroup2_find, self).execute(cn, **kw)
|
||||
return super(hostgroup_find, self).execute(cn, **kw)
|
||||
|
||||
api.register(hostgroup2_find)
|
||||
api.register(hostgroup_find)
|
||||
|
||||
|
||||
class hostgroup2_show(basegroup2_show):
|
||||
class hostgroup_show(basegroup_show):
|
||||
"""
|
||||
Examine an existing hostgroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(hostgroup2_show, self).execute(cn, **kw)
|
||||
return super(hostgroup_show, self).execute(cn, **kw)
|
||||
|
||||
api.register(hostgroup2_show)
|
||||
api.register(hostgroup_show)
|
||||
|
||||
|
||||
class hostgroup2_add_member(basegroup2_add_member):
|
||||
class hostgroup_add_member(basegroup_add_member):
|
||||
"""
|
||||
Add members to hostgroup.
|
||||
"""
|
||||
@ -166,10 +166,10 @@ class hostgroup2_add_member(basegroup2_add_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, self.default_attributes))
|
||||
|
||||
api.register(hostgroup2_add_member)
|
||||
api.register(hostgroup_add_member)
|
||||
|
||||
|
||||
class hostgroup2_del_member(basegroup2_del_member):
|
||||
class hostgroup_del_member(basegroup_del_member):
|
||||
"""
|
||||
Remove members from hostgroup.
|
||||
"""
|
||||
@ -236,5 +236,5 @@ class hostgroup2_del_member(basegroup2_del_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, _default_attributes))
|
||||
|
||||
api.register(hostgroup2_del_member)
|
||||
api.register(hostgroup_del_member)
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Netgroups.
|
||||
"""
|
||||
|
||||
from ipalib import api
|
||||
from ipalib.plugins.basegroup2 import *
|
||||
from ipalib.plugins.basegroup import *
|
||||
from ipalib import uuid
|
||||
|
||||
_container_dn = 'cn=ng,cn=alt'
|
||||
@ -32,16 +32,16 @@ _default_attributes = [
|
||||
_default_class = 'ipanisnetgroup'
|
||||
|
||||
|
||||
class netgroup2(basegroup2):
|
||||
class netgroup(basegroup):
|
||||
"""
|
||||
Netgroup object.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(netgroup2)
|
||||
api.register(netgroup)
|
||||
|
||||
|
||||
class netgroup2_create(basegroup2_create):
|
||||
class netgroup_create(basegroup_create):
|
||||
"""
|
||||
Create new netgroup.
|
||||
"""
|
||||
@ -79,10 +79,10 @@ class netgroup2_create(basegroup2_create):
|
||||
|
||||
return ldap.get_entry(dn, _default_attributes)
|
||||
|
||||
api.register(netgroup2_create)
|
||||
api.register(netgroup_create)
|
||||
|
||||
|
||||
class netgroup2_delete(basegroup2_delete):
|
||||
class netgroup_delete(basegroup_delete):
|
||||
"""
|
||||
Delete netgroup.
|
||||
"""
|
||||
@ -90,12 +90,12 @@ class netgroup2_delete(basegroup2_delete):
|
||||
filter_class = _default_class
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(netgroup2_delete, self).execute(cn, **kw)
|
||||
return super(netgroup_delete, self).execute(cn, **kw)
|
||||
|
||||
api.register(netgroup2_delete)
|
||||
api.register(netgroup_delete)
|
||||
|
||||
|
||||
class netgroup2_mod(basegroup2_mod):
|
||||
class netgroup_mod(basegroup_mod):
|
||||
"""
|
||||
Edit an existing netgroup.
|
||||
"""
|
||||
@ -103,12 +103,12 @@ class netgroup2_mod(basegroup2_mod):
|
||||
filter_class = _default_class
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(netgroup2_mod, self).execute(cn, **kw)
|
||||
return super(netgroup_mod, self).execute(cn, **kw)
|
||||
|
||||
api.register(netgroup2_mod)
|
||||
api.register(netgroup_mod)
|
||||
|
||||
|
||||
class netgroup2_find(basegroup2_find):
|
||||
class netgroup_find(basegroup_find):
|
||||
"""
|
||||
Search the groups.
|
||||
"""
|
||||
@ -116,12 +116,12 @@ class netgroup2_find(basegroup2_find):
|
||||
filter_class = _default_class
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(netgroup2_find, self).execute(cn, **kw)
|
||||
return super(netgroup_find, self).execute(cn, **kw)
|
||||
|
||||
api.register(netgroup2_find)
|
||||
api.register(netgroup_find)
|
||||
|
||||
|
||||
class netgroup2_show(basegroup2_show):
|
||||
class netgroup_show(basegroup_show):
|
||||
"""
|
||||
Display netgroup.
|
||||
"""
|
||||
@ -130,12 +130,12 @@ class netgroup2_show(basegroup2_show):
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(netgroup2_show, self).execute(cn, **kw)
|
||||
return super(netgroup_show, self).execute(cn, **kw)
|
||||
|
||||
api.register(netgroup2_show)
|
||||
api.register(netgroup_show)
|
||||
|
||||
|
||||
class netgroup2_add_member(basegroup2_add_member):
|
||||
class netgroup_add_member(basegroup_add_member):
|
||||
"""
|
||||
Add members to netgroup.
|
||||
"""
|
||||
@ -143,7 +143,7 @@ class netgroup2_add_member(basegroup2_add_member):
|
||||
container = _container_dn
|
||||
filter_class = _default_class
|
||||
|
||||
takes_options = basegroup2_add_member.takes_options + (
|
||||
takes_options = basegroup_add_member.takes_options + (
|
||||
List('hosts?',
|
||||
cli_name='hosts',
|
||||
doc='comma-separated list of hosts to add'
|
||||
@ -250,10 +250,10 @@ class netgroup2_add_member(basegroup2_add_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, _default_attributes))
|
||||
|
||||
api.register(netgroup2_add_member)
|
||||
api.register(netgroup_add_member)
|
||||
|
||||
|
||||
class netgroup2_del_member(basegroup2_del_member):
|
||||
class netgroup_del_member(basegroup_del_member):
|
||||
"""
|
||||
Remove a member from a netgroup.
|
||||
"""
|
||||
@ -261,7 +261,7 @@ class netgroup2_del_member(basegroup2_del_member):
|
||||
container = _container_dn
|
||||
filter_class = _default_class
|
||||
|
||||
takes_options = basegroup2_del_member.takes_options + (
|
||||
takes_options = basegroup_del_member.takes_options + (
|
||||
List('hosts?',
|
||||
cli_name='hosts',
|
||||
doc='comma-separated list of hosts to remove'
|
||||
@ -368,5 +368,5 @@ class netgroup2_del_member(basegroup2_del_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, _default_attributes))
|
||||
|
||||
api.register(netgroup2_del_member)
|
||||
api.register(netgroup_del_member)
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ from ipalib import Command
|
||||
from ipalib import Str, Password
|
||||
|
||||
|
||||
class passwd2(Command):
|
||||
class passwd(Command):
|
||||
"""
|
||||
Change user password.
|
||||
"""
|
||||
@ -74,5 +74,5 @@ class passwd2(Command):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Changed password for "%s."' % principal)
|
||||
|
||||
api.register(passwd2)
|
||||
api.register(passwd)
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ def _convert_time_for_output(entry_attrs):
|
||||
)
|
||||
|
||||
|
||||
class pwpolicy2_mod(Command):
|
||||
class pwpolicy_mod(Command):
|
||||
"""
|
||||
Modify password policy.
|
||||
"""
|
||||
@ -118,10 +118,10 @@ class pwpolicy2_mod(Command):
|
||||
textui.print_attribute(v, entry_attrs[k])
|
||||
textui.print_dashed('Modified password policy.')
|
||||
|
||||
api.register(pwpolicy2_mod)
|
||||
api.register(pwpolicy_mod)
|
||||
|
||||
|
||||
class pwpolicy2_show(Command):
|
||||
class pwpolicy_show(Command):
|
||||
"""
|
||||
Display password policy.
|
||||
"""
|
||||
@ -144,5 +144,5 @@ class pwpolicy2_show(Command):
|
||||
if k in entry_attrs:
|
||||
textui.print_attribute(v, entry_attrs[k])
|
||||
|
||||
api.register(pwpolicy2_show)
|
||||
api.register(pwpolicy_show)
|
||||
|
||||
|
||||
@ -23,71 +23,71 @@ Groups of roles
|
||||
"""
|
||||
|
||||
from ipalib import api
|
||||
from ipalib.plugins.basegroup2 import *
|
||||
from ipalib.plugins.basegroup import *
|
||||
|
||||
_container_dn = api.env.container_rolegroup
|
||||
_default_attributes = ['cn', 'description', 'member', 'memberOf']
|
||||
_default_class = 'nestedGroup'
|
||||
|
||||
|
||||
class rolegroup2(basegroup2):
|
||||
class rolegroup(basegroup):
|
||||
"""
|
||||
Rolegroup object.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(rolegroup2)
|
||||
api.register(rolegroup)
|
||||
|
||||
|
||||
class rolegroup2_create(basegroup2_create):
|
||||
class rolegroup_create(basegroup_create):
|
||||
"""
|
||||
Create new rolegroup.
|
||||
"""
|
||||
base_classes = basegroup2_create.base_classes + (_default_class, )
|
||||
base_classes = basegroup_create.base_classes + (_default_class, )
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_create, self).execute(cn, **kw)
|
||||
return super(rolegroup_create, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_create)
|
||||
api.register(rolegroup_create)
|
||||
|
||||
|
||||
class rolegroup2_delete(basegroup2_delete):
|
||||
class rolegroup_delete(basegroup_delete):
|
||||
"""
|
||||
Delete rolegroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_delete, self).execute(cn, **kw)
|
||||
return super(rolegroup_delete, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_delete)
|
||||
api.register(rolegroup_delete)
|
||||
|
||||
|
||||
class rolegroup2_mod(basegroup2_mod):
|
||||
class rolegroup_mod(basegroup_mod):
|
||||
"""
|
||||
Edit rolegroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_mod, self).execute(cn, **kw)
|
||||
return super(rolegroup_mod, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_mod)
|
||||
api.register(rolegroup_mod)
|
||||
|
||||
|
||||
class rolegroup2_find(basegroup2_find):
|
||||
class rolegroup_find(basegroup_find):
|
||||
"""
|
||||
Search for rolegroups.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_find, self).execute(cn, **kw)
|
||||
return super(rolegroup_find, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_find)
|
||||
api.register(rolegroup_find)
|
||||
|
||||
|
||||
class rolegroup2_show(basegroup2_show):
|
||||
class rolegroup_show(basegroup_show):
|
||||
"""
|
||||
Display rolegroup.
|
||||
"""
|
||||
@ -95,31 +95,31 @@ class rolegroup2_show(basegroup2_show):
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_show, self).execute(cn, **kw)
|
||||
return super(rolegroup_show, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_show)
|
||||
api.register(rolegroup_show)
|
||||
|
||||
|
||||
class rolegroup2_add_member(basegroup2_add_member):
|
||||
class rolegroup_add_member(basegroup_add_member):
|
||||
"""
|
||||
Add member to rolegroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_add_member, self).execute(cn, **kw)
|
||||
return super(rolegroup_add_member, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_add_member)
|
||||
api.register(rolegroup_add_member)
|
||||
|
||||
|
||||
class rolegroup2_del_member(basegroup2_del_member):
|
||||
class rolegroup_del_member(basegroup_del_member):
|
||||
"""
|
||||
Remove member from rolegroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
def execute(self, cn, **kw):
|
||||
return super(rolegroup2_del_member, self).execute(cn, **kw)
|
||||
return super(rolegroup_del_member, self).execute(cn, **kw)
|
||||
|
||||
api.register(rolegroup2_del_member)
|
||||
api.register(rolegroup_del_member)
|
||||
|
||||
|
||||
@ -82,7 +82,7 @@ def validate_certificate(ugettext, cert):
|
||||
raise errors.Base64DecodeError(reason=str(e))
|
||||
|
||||
|
||||
class service2(Object):
|
||||
class service(Object):
|
||||
"""
|
||||
Service object.
|
||||
"""
|
||||
@ -99,10 +99,10 @@ class service2(Object):
|
||||
),
|
||||
)
|
||||
|
||||
api.register(service2)
|
||||
api.register(service)
|
||||
|
||||
|
||||
class service2_create(crud.Create):
|
||||
class service_create(crud.Create):
|
||||
"""
|
||||
Add new service.
|
||||
"""
|
||||
@ -168,10 +168,10 @@ class service2_create(crud.Create):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Created service "%s".' % principal)
|
||||
|
||||
api.register(service2_create)
|
||||
api.register(service_create)
|
||||
|
||||
|
||||
class service2_delete(crud.Delete):
|
||||
class service_delete(crud.Delete):
|
||||
"""
|
||||
Delete an existing service.
|
||||
"""
|
||||
@ -206,10 +206,10 @@ class service2_delete(crud.Delete):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Deleted service "%s".' % principal)
|
||||
|
||||
api.register(service2_delete)
|
||||
api.register(service_delete)
|
||||
|
||||
|
||||
class service2_mod(crud.Update):
|
||||
class service_mod(crud.Update):
|
||||
"""
|
||||
Modify service.
|
||||
"""
|
||||
@ -244,10 +244,10 @@ class service2_mod(crud.Update):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Modified service "%s".' % principal)
|
||||
|
||||
api.register(service2_mod)
|
||||
api.register(service_mod)
|
||||
|
||||
|
||||
class service2_find(crud.Search):
|
||||
class service_find(crud.Search):
|
||||
"""
|
||||
Search for services.
|
||||
"""
|
||||
@ -313,10 +313,10 @@ class service2_find(crud.Search):
|
||||
'Please refine your search and try again.', above=False
|
||||
)
|
||||
|
||||
api.register(service2_find)
|
||||
api.register(service_find)
|
||||
|
||||
|
||||
class service2_show(crud.Retrieve):
|
||||
class service_show(crud.Retrieve):
|
||||
"""
|
||||
Display service.
|
||||
"""
|
||||
@ -358,5 +358,5 @@ class service2_show(crud.Retrieve):
|
||||
textui.print_attribute('dn', dn)
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
api.register(service2_show)
|
||||
api.register(service_show)
|
||||
|
||||
|
||||
@ -28,61 +28,61 @@ from ipalib.plugins.basegroup2 import *
|
||||
_container_dn = api.env.container_taskgroup
|
||||
_default_attributes = ['cn', 'description', 'member', 'memberOf']
|
||||
|
||||
class taskgroup2(basegroup2):
|
||||
class taskgroup(basegroup2):
|
||||
"""
|
||||
Taskgroup object.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(taskgroup2)
|
||||
api.register(taskgroup)
|
||||
|
||||
|
||||
class taskgroup2_create(basegroup2_create):
|
||||
class taskgroup_create(basegroup2_create):
|
||||
"""
|
||||
Create new taskgroup.
|
||||
"""
|
||||
|
||||
api.register(taskgroup2_create)
|
||||
api.register(taskgroup_create)
|
||||
|
||||
|
||||
class taskgroup2_delete(basegroup2_delete):
|
||||
class taskgroup_delete(basegroup2_delete):
|
||||
"""
|
||||
Delete taskgroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(taskgroup2_delete)
|
||||
api.register(taskgroup_delete)
|
||||
|
||||
|
||||
class taskgroup2_mod(basegroup2_mod):
|
||||
class taskgroup_mod(basegroup2_mod):
|
||||
"""
|
||||
Edit taskgroup.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(taskgroup2_mod)
|
||||
api.register(taskgroup_mod)
|
||||
|
||||
|
||||
class taskgroup2_find(basegroup2_find):
|
||||
class taskgroup_find(basegroup2_find):
|
||||
"""
|
||||
Search for taskgroups.
|
||||
"""
|
||||
container = _container_dn
|
||||
|
||||
api.register(taskgroup2_find)
|
||||
api.register(taskgroup_find)
|
||||
|
||||
|
||||
class taskgroup2_show(basegroup2_show):
|
||||
class taskgroup_show(basegroup2_show):
|
||||
"""
|
||||
Display taskgroup.
|
||||
"""
|
||||
default_attributes = _default_attributes
|
||||
container = _container_dn
|
||||
|
||||
api.register(taskgroup2_show)
|
||||
api.register(taskgroup_show)
|
||||
|
||||
|
||||
class taskgroup2_add_member(basegroup2_add_member):
|
||||
class taskgroup_add_member(basegroup2_add_member):
|
||||
"""
|
||||
Add member to taskgroup.
|
||||
"""
|
||||
@ -141,10 +141,10 @@ class taskgroup2_add_member(basegroup2_add_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, _default_attributes))
|
||||
|
||||
api.register(taskgroup2_add_member)
|
||||
api.register(taskgroup_add_member)
|
||||
|
||||
|
||||
class taskgroup2_del_member(basegroup2_del_member):
|
||||
class taskgroup_del_member(basegroup2_del_member):
|
||||
"""
|
||||
Remove member from taskgroup.
|
||||
"""
|
||||
@ -203,5 +203,5 @@ class taskgroup2_del_member(basegroup2_del_member):
|
||||
|
||||
return (completed, ldap.get_entry(dn, _default_attributes))
|
||||
|
||||
api.register(taskgroup2_del_member)
|
||||
api.register(taskgroup_del_member)
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ _default_attributes = [
|
||||
]
|
||||
|
||||
|
||||
class user2(Object):
|
||||
class user(Object):
|
||||
"""
|
||||
User object.
|
||||
"""
|
||||
@ -92,10 +92,10 @@ class user2(Object):
|
||||
),
|
||||
)
|
||||
|
||||
api.register(user2)
|
||||
api.register(user)
|
||||
|
||||
|
||||
class user2_create(crud.Create):
|
||||
class user_create(crud.Create):
|
||||
"""
|
||||
Create new user.
|
||||
"""
|
||||
@ -169,10 +169,10 @@ class user2_create(crud.Create):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Created user "%s".' % uid)
|
||||
|
||||
api.register(user2_create)
|
||||
api.register(user_create)
|
||||
|
||||
|
||||
class user2_delete(crud.Delete):
|
||||
class user_delete(crud.Delete):
|
||||
"""
|
||||
Delete user.
|
||||
"""
|
||||
@ -201,10 +201,10 @@ class user2_delete(crud.Delete):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Deleted user "%s".' % uid)
|
||||
|
||||
api.register(user2_delete)
|
||||
api.register(user_delete)
|
||||
|
||||
|
||||
class user2_mod(crud.Update):
|
||||
class user_mod(crud.Update):
|
||||
"""
|
||||
Modify user.
|
||||
"""
|
||||
@ -233,10 +233,10 @@ class user2_mod(crud.Update):
|
||||
textui.print_entry(entry_attrs)
|
||||
textui.print_dashed('Modified user "%s".' % uid)
|
||||
|
||||
api.register(user2_mod)
|
||||
api.register(user_mod)
|
||||
|
||||
|
||||
class user2_find(crud.Search):
|
||||
class user_find(crud.Search):
|
||||
"""
|
||||
Search for users.
|
||||
"""
|
||||
@ -295,10 +295,10 @@ class user2_find(crud.Search):
|
||||
'Please refine your search and try again.', above=False
|
||||
)
|
||||
|
||||
api.register(user2_find)
|
||||
api.register(user_find)
|
||||
|
||||
|
||||
class user2_show(crud.Retrieve):
|
||||
class user_show(crud.Retrieve):
|
||||
"""
|
||||
Display user.
|
||||
"""
|
||||
@ -331,10 +331,10 @@ class user2_show(crud.Retrieve):
|
||||
textui.print_attribute('dn', dn)
|
||||
textui.print_entry(entry_attrs)
|
||||
|
||||
api.register(user2_show)
|
||||
api.register(user_show)
|
||||
|
||||
|
||||
class user2_lock(Command):
|
||||
class user_lock(Command):
|
||||
"""
|
||||
Lock user account.
|
||||
"""
|
||||
@ -366,10 +366,10 @@ class user2_lock(Command):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Locked user "%s".' % uid)
|
||||
|
||||
api.register(user2_lock)
|
||||
api.register(user_lock)
|
||||
|
||||
|
||||
class user2_unlock(Command):
|
||||
class user_unlock(Command):
|
||||
"""
|
||||
Unlock user account.
|
||||
"""
|
||||
@ -401,5 +401,5 @@ class user2_unlock(Command):
|
||||
textui.print_name(self.name)
|
||||
textui.print_dashed('Unlocked user "%s".' % uid)
|
||||
|
||||
api.register(user2_unlock)
|
||||
api.register(user_unlock)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user