diff options
| -rw-r--r-- | API.txt | 27 | ||||
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | ipalib/constants.py | 1 | ||||
| -rw-r--r-- | ipalib/plugins/server.py | 89 |
4 files changed, 119 insertions, 2 deletions
@@ -3545,6 +3545,33 @@ option: Str('version?', exclude='webui') output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None) output: PrimaryKey('value', None, None) +command: server_find +args: 1,10,4 +arg: Str('criteria?', noextrawhitespace=False) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui') +option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False) +option: Int('ipamaxdomainlevel', attribute=True, autofill=False, cli_name='maxlevel', multivalue=False, query=True, required=False) +option: Int('ipamindomainlevel', attribute=True, autofill=False, cli_name='minlevel', multivalue=False, query=True, required=False) +option: Str('iparepltopomanagedsuffix', attribute=True, autofill=False, cli_name='suffix', multivalue=False, query=True, required=False) +option: Flag('pkey_only?', autofill=True, default=False) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui') +option: Int('sizelimit?', autofill=False, minvalue=0) +option: Int('timelimit?', autofill=False, minvalue=0) +option: Str('version?', exclude='webui') +output: Output('count', <type 'int'>, None) +output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None)) +output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None) +output: Output('truncated', <type 'bool'>, None) +command: server_show +args: 1,4,3 +arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui') +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui') +option: Flag('rights', autofill=True, default=False) +option: Str('version?', exclude='webui') +output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None) +output: PrimaryKey('value', None, None) command: service_add args: 1,11,3 arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, required=True) @@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000 # # ######################################################## IPA_API_VERSION_MAJOR=2 -IPA_API_VERSION_MINOR=120 -# Last change: tbabej - Add Domain Level feature +IPA_API_VERSION_MINOR=121 +# Last change: pvoborni - added server-find and server-show diff --git a/ipalib/constants.py b/ipalib/constants.py index b99306eae..95dec54a5 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -117,6 +117,7 @@ DEFAULT_CONFIG = ( ('container_otp', DN(('cn', 'otp'))), ('container_radiusproxy', DN(('cn', 'radiusproxy'))), ('container_views', DN(('cn', 'views'), ('cn', 'accounts'))), + ('container_masters', DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'))), # Ports, hosts, and URIs: ('xmlrpc_uri', 'http://localhost:8888/ipa/xml'), diff --git a/ipalib/plugins/server.py b/ipalib/plugins/server.py new file mode 100644 index 000000000..d22f1ea36 --- /dev/null +++ b/ipalib/plugins/server.py @@ -0,0 +1,89 @@ +# +# Copyright (C) 2015 FreeIPA Contributors see COPYING for license +# + +import string +import os + +from ipalib import api +from ipalib import Int, Str +from ipalib.plugable import Registry +from ipalib.plugins.baseldap import * +from ipalib.plugins import baseldap +from ipalib import _, ngettext + +__doc__ = _(""" +IPA servers +""") + _(""" +Get information about installed IPA servers. +""") + _(""" +EXAMPLES: +""") + _(""" + Find all servers: + ipa server-find +""") + _(""" + Show specific server: + ipa server-show ipa.example.com +""") + +register = Registry() + + +@register() +class server(LDAPObject): + """ + IPA server + """ + container_dn = api.env.container_masters + object_name = _('server') + object_name_plural = _('servers') + object_class = ['top'] + default_attributes = [ + 'cn', 'iparepltopomanagedsuffix', 'ipamindomainlevel', + 'ipamaxdomainlevel' + ] + label = _('IPA Servers') + label_singular = _('IPA Server') + takes_params = ( + Str( + 'cn', + cli_name='name', + primary_key=True, + label=_('Server name'), + doc=_('IPA server hostname'), + ), + Str( + 'iparepltopomanagedsuffix', + cli_name='suffix', + label=_('Managed suffix'), + ), + Int( + 'ipamindomainlevel', + cli_name='minlevel', + label=_('Min domain level'), + doc=_('Minimum domain level'), + flags={'no_create', 'no_update'}, + ), + Int( + 'ipamaxdomainlevel', + cli_name='maxlevel', + label=_('Max domain level'), + doc=_('Maximum domain level'), + flags={'no_create', 'no_update'}, + ), + ) + + +@register() +class server_find(LDAPSearch): + __doc__ = _('Search for IPA servers.') + + msg_summary = ngettext( + '%(count)d IPA server matched', + '%(count)d IPA servers matched', 0 + ) + + +@register() +class server_show(LDAPRetrieve): + __doc__ = _('Show IPA server.') |