diff options
author | Jan Cholasta <jcholast@redhat.com> | 2016-04-28 10:15:01 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-03 09:00:34 +0200 |
commit | 4c7be74526bd89ed1b481f3a1ac4bb467ee0ea2c (patch) | |
tree | 3db268df3cfa41bd8a3c4655967e6931428b1ba9 /ipalib/plugins/idrange.py | |
parent | 6cfb9d73d9701767d8b76d7ff5bbc080a6be9386 (diff) | |
download | freeipa-4c7be74526bd89ed1b481f3a1ac4bb467ee0ea2c.tar.gz freeipa-4c7be74526bd89ed1b481f3a1ac4bb467ee0ea2c.tar.xz freeipa-4c7be74526bd89ed1b481f3a1ac4bb467ee0ea2c.zip |
ipalib: split off client-side plugin code into ipaclient
Provide client-side overrides for command plugins which implement any of
the client-side `interactive_prompt_callback`, `forward` or
`output_for_cli` methods and move the methods from the original plugins to
the overrides.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipalib/plugins/idrange.py')
-rw-r--r-- | ipalib/plugins/idrange.py | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py index 3947c640f..7e868c363 100644 --- a/ipalib/plugins/idrange.py +++ b/ipalib/plugins/idrange.py @@ -401,68 +401,6 @@ class idrange_add(LDAPCreate): msg_summary = _('Added ID range "%(value)s"') - def interactive_prompt_callback(self, kw): - """ - Ensure that rid-base is prompted for when dom-sid is specified. - - Also ensure that secondary-rid-base is prompted for when rid-base is - specified and vice versa, in case that dom-sid was not specified. - - Also ensure that rid-base and secondary-rid-base is prompted for - if ipa-adtrust-install has been run on the system. - """ - - # dom-sid can be specified using dom-sid or dom-name options - - # it can be also set using --setattr or --addattr, in these cases - # we will not prompt, but raise an ValidationError later - - dom_sid_set = any(dom_id in kw for dom_id in - ('ipanttrusteddomainname', 'ipanttrusteddomainsid')) - - rid_base = kw.get('ipabaserid', None) - secondary_rid_base = kw.get('ipasecondarybaserid', None) - range_type = kw.get('iparangetype', None) - - def set_from_prompt(param): - value = self.prompt_param(self.params[param]) - update = {param: value} - kw.update(update) - - if dom_sid_set: - # This is a trusted range - - # Prompt for RID base if domain SID / name was given - if rid_base is None and range_type != u'ipa-ad-trust-posix': - set_from_prompt('ipabaserid') - - else: - # This is a local range - # Find out whether ipa-adtrust-install has been ran - adtrust_is_enabled = api.Command['adtrust_is_enabled']()['result'] - - if adtrust_is_enabled: - # If ipa-adtrust-install has been ran, all local ranges - # require both RID base and secondary RID base - - if rid_base is None: - set_from_prompt('ipabaserid') - - if secondary_rid_base is None: - set_from_prompt('ipasecondarybaserid') - - else: - # This is a local range on a server with no adtrust support - - # Prompt for secondary RID base only if RID base was given - if rid_base is not None and secondary_rid_base is None: - set_from_prompt('ipasecondarybaserid') - - # Symetrically, prompt for RID base if secondary RID base was - # given - if rid_base is None and secondary_rid_base is not None: - set_from_prompt('ipabaserid') - def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): assert isinstance(dn, DN) |