IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Generate same API.txt under Python 2 and 3

Browse Source 
Use Python 3's reprlib with customizations to create same API.txt under
Python 2 and 3. Some plugins have been slightly altered to use stable
sorting for dynamically created parameter lists.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes
2018-02-14 16:59:50 +01:00
parent 86a6fdcc43
commit 8ffa33c24e
8 changed files with 111 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ipaserver/plugins/trust.py
View File

@@ -657,48 +657,52 @@ ipa idrange-del before retrying the command with the desired range type.
Str('realm_admin?',
cli_name='admin',
label=_("Active Directory domain administrator"),
),
),
Password('realm_passwd?',
cli_name='password',
label=_("Active Directory domain administrator's password"),
confirm=False,
),
cli_name='password',
label=_("Active Directory domain administrator's password"),
confirm=False,
),
Str('realm_server?',
cli_name='server',
label=_('Domain controller for the Active Directory domain (optional)'),
),
label=_('Domain controller for the Active Directory domain '
'(optional)'),
),
Password('trust_secret?',
cli_name='trust_secret',
label=_('Shared secret for the trust'),
confirm=False,
),
cli_name='trust_secret',
label=_('Shared secret for the trust'),
confirm=False,
),
Int('base_id?',
cli_name='base_id',
label=_('First Posix ID of the range reserved for the trusted domain'),
),
label=_('First Posix ID of the range reserved for the '
'trusted domain'),
),
Int('range_size?',
cli_name='range_size',
label=_('Size of the ID range reserved for the trusted domain'),
),
label=_('Size of the ID range reserved for the trusted domain')
),
StrEnum('range_type?',
label=_('Range type'),
cli_name='range_type',
doc=(_('Type of trusted domain ID range, one of {vals}'
.format(vals=', '.join(range_types.keys())))),
values=tuple(range_types.keys()),
),
label=_('Range type'),
cli_name='range_type',
doc=(_('Type of trusted domain ID range, one of {vals}'
.format(vals=', '.join(sorted(range_types))))),
values=sorted(range_types),
),
Bool('bidirectional?',
label=_('Two-way trust'),
cli_name='two_way',
doc=(_('Establish bi-directional trust. By default trust is inbound one-way only.')),
doc=(_('Establish bi-directional trust. By default trust is '
'inbound one-way only.')),
default=False,
),
),
Bool('external?',
label=_('External trust'),
cli_name='external',
doc=(_('Establish external trust to a domain in another forest. The trust is not transitive beyond the domain.')),
doc=_('Establish external trust to a domain in another forest. '
'The trust is not transitive beyond the domain.'),
default=False,
),
),
)
msg_summary = _('Added Active Directory trust for realm "%(value)s"')