From b1321e95d7bb2cd52fc4eb9caa1d3b9b384eea83 Mon Sep 17 00:00:00 2001 From: Ana Krivokapic Date: Wed, 29 May 2013 09:15:19 -0400 Subject: Deprecate options --dom-sid and --dom-name in idrange-mod https://fedorahosted.org/freeipa/ticket/3636 --- ipalib/plugins/idrange.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py index d5487944..22383ba9 100644 --- a/ipalib/plugins/idrange.py +++ b/ipalib/plugins/idrange.py @@ -17,13 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from ipalib.plugins.baseldap import * -from ipalib import api, Str, Password, DefaultFrom, _, ngettext, Object -from ipalib.parameters import Enum -from ipalib import Command +from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPDelete, + LDAPRetrieve, LDAPSearch, LDAPUpdate) +from ipalib import api, Int, Str, DeprecatedParam, _, ngettext from ipalib import errors -from ipapython import ipautil -from ipalib import util from ipapython.dn import DN if api.env.in_server and api.env.context in ['lite', 'server']: @@ -195,11 +192,12 @@ class idrange(LDAPObject): ), Str('ipanttrusteddomainsid?', cli_name='dom_sid', + flags=('no_update',), label=_('Domain SID of the trusted domain'), ), Str('ipanttrusteddomainname?', cli_name='dom_name', - flags=('no_search', 'virtual_attribute'), + flags=('no_search', 'virtual_attribute', 'no_update'), label=_('Name of the trusted domain'), ), Str('iparangetype?', @@ -498,6 +496,11 @@ class idrange_mod(LDAPUpdate): msg_summary = _('Modified ID range "%(value)s"') + takes_options = LDAPUpdate.takes_options + ( + DeprecatedParam('ipanttrusteddomainsid?'), + DeprecatedParam('ipanttrusteddomainname?'), + ) + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): assert isinstance(dn, DN) attrs_list.append('objectclass') -- cgit