diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/frontend.py | 13 | ||||
| -rw-r--r-- | ipalib/plugins/aci.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/automount.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/permission.py | 47 |
4 files changed, 48 insertions, 20 deletions
diff --git a/ipalib/frontend.py b/ipalib/frontend.py index 10087ba24..c28fa54ae 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -29,7 +29,8 @@ from parameters import create_param, parse_param_spec, Param, Str, Flag, Passwor from output import Output, Entry, ListOfEntries from text import _, ngettext -from errors import ZeroArgumentError, MaxArgumentError, OverlapError, RequiresRoot, VersionError, RequirementError +from errors import (ZeroArgumentError, MaxArgumentError, OverlapError, + RequiresRoot, VersionError, RequirementError, OptionError) from errors import InvocationError from constants import TYPE_ERROR from ipapython.version import API_VERSION @@ -404,6 +405,8 @@ class Command(HasParam): output_params = Plugin.finalize_attr('output_params') has_output_params = tuple() + internal_options = tuple() + msg_summary = None msg_truncated = _('Results are truncated, try a more specific search') @@ -520,7 +523,13 @@ class Command(HasParam): def __options_2_params(self, options): for name in self.params: if name in options: - yield (name, options[name]) + yield (name, options.pop(name)) + # If any options remain, they are either internal or unknown + unused_keys = set(options).difference(self.internal_options) + unused_keys.discard('version') + if unused_keys: + raise OptionError(_('Unknown option: %(option)s'), + option=unused_keys.pop()) def args_options_2_entry(self, *args, **options): """ diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index f7c6039a9..7a27ce116 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -610,6 +610,8 @@ class aci_mod(crud.Update): takes_options = (_prefix_option,) + internal_options = ['rename'] + msg_summary = _('Modified ACI "%(value)s"') def execute(self, aciname, **kw): diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index dda14cc78..5c9f42b4c 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -787,6 +787,8 @@ class automountkey_add(LDAPCreate): msg_summary = _('Added automount key "%(value)s"') + internal_options = ['description', 'add_operation'] + def pre_callback(self, ldap, dn, entry_attrs, *keys, **options): options.pop('add_operation', None) options.pop('description', None) @@ -846,7 +848,7 @@ class automountmap_add_indirect(LDAPCreate): self.api.Command['automountmap_show'](location, parentmap) # Add a submount key self.api.Command['automountkey_add']( - location, parentmap, automountkey=key, key=key, + location, parentmap, automountkey=key, automountinformation='-fstype=autofs ldap:%s' % map) else: # adding to auto.master # Ensure auto.master exists @@ -910,6 +912,8 @@ class automountkey_mod(LDAPUpdate): msg_summary = _('Modified automount key "%(value)s"') + internal_options = ['newautomountkey'] + takes_options = LDAPUpdate.takes_options + ( IA5Str('newautomountinformation?', cli_name='newinfo', diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index d6fe385b1..05d19ad8d 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -90,6 +90,16 @@ output_params = ( ), ) +def filter_options(options, keys): + """Return a dict that includes entries from `options` that are in `keys` + + example: + >>> filtered = filter_options({'a': 1, 'b': 2, 'c': 3}, ['a', 'c']) + >>> filtered == {'a': 1, 'c': 3} + True + """ + return dict((k, options[k]) for k in keys if k in options) + class permission(LDAPObject): """ Permission object. @@ -331,7 +341,7 @@ class permission_mod(LDAPUpdate): cn = options['rename'] # rename finished - common_options = dict((k, options[k]) for k in ('all', 'raw') if k in options) + common_options = filter_options(options, ['all', 'raw']) result = self.api.Command.permission_show(cn, **common_options)['result'] for r in result: if not r.startswith('member_'): @@ -350,12 +360,19 @@ class permission_find(LDAPSearch): has_output_params = LDAPSearch.has_output_params + output_params def post_callback(self, ldap, entries, truncated, *args, **options): + + # There is an option/param overlap: "cn" must be passed as "aciname" + # to aci-find. Besides that we don't need cn anymore so pop it + aciname = options.pop('cn', None) + pkey_only = options.pop('pkey_only', False) if not pkey_only: for entry in entries: (dn, attrs) = entry try: - aci = self.api.Command.aci_show(attrs['cn'][0], aciprefix=ACI_PREFIX, **options)['result'] + common_options = filter_options(options, ['all', 'raw']) + aci = self.api.Command.aci_show(attrs['cn'][0], + aciprefix=ACI_PREFIX, **common_options)['result'] # copy information from respective ACI to permission entry for attr in self.obj.aci_attributes: @@ -377,23 +394,16 @@ class permission_find(LDAPSearch): # aren't already in the list along with their permission info. opts = copy.copy(options) + if aciname: + opts['aciname'] = aciname opts['aciprefix'] = ACI_PREFIX - try: - # permission ACI attribute is needed - del opts['raw'] - except: - pass - if 'cn' in options: - # the attribute for name is difference in acis - opts['aciname'] = options['cn'] + # permission ACI attribute is needed + opts.pop('raw', None) + opts.pop('sizelimit', None) aciresults = self.api.Command.aci_find(*args, **opts) truncated = truncated or aciresults['truncated'] results = aciresults['result'] - if 'cn' in options: - # there is an option/param overlap if --name is in the - # search list, we don't need cn anymore so drop it. - options.pop('cn') for aci in results: found = False if 'permission' in aci: @@ -403,7 +413,9 @@ class permission_find(LDAPSearch): found = True break if not found: - permission = self.api.Command.permission_show(aci['permission'], **options)['result'] + common_options = filter_options(options, ['all', 'raw']) + permission = self.api.Command.permission_show( + aci['permission'], **common_options)['result'] dn = permission['dn'] del permission['dn'] if pkey_only: @@ -429,8 +441,9 @@ class permission_show(LDAPRetrieve): has_output_params = LDAPRetrieve.has_output_params + output_params def post_callback(self, ldap, dn, entry_attrs, *keys, **options): try: - common_options = dict((k, options[k]) for k in ('all', 'raw') if k in options) - aci = self.api.Command.aci_show(keys[-1], aciprefix=ACI_PREFIX, **common_options)['result'] + common_options = filter_options(options, ['all', 'raw']) + aci = self.api.Command.aci_show(keys[-1], aciprefix=ACI_PREFIX, + **common_options)['result'] for attr in self.obj.aci_attributes: if attr in aci: entry_attrs[attr] = aci[attr] |