diff options
author | Jan Cholasta <jcholast@redhat.com> | 2016-03-03 15:12:19 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-05-25 16:06:26 +0200 |
commit | bed546ee8220992084520737320a646dc47ec1e3 (patch) | |
tree | ee04abce4857196b44c2c463b06aa10147eea135 /ipalib | |
parent | 0d62968b6f853246d38b06e8378cb9cae7f9bbb4 (diff) | |
download | freeipa-bed546ee8220992084520737320a646dc47ec1e3.tar.gz freeipa-bed546ee8220992084520737320a646dc47ec1e3.tar.xz freeipa-bed546ee8220992084520737320a646dc47ec1e3.zip |
ipalib, ipaserver: migrate all plugins to Registry-based registration
Do not use the deprecated API.register method.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/__init__.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/hbacrule.py | 7 | ||||
-rw-r--r-- | ipalib/plugins/rpcclient.py | 13 |
3 files changed, 12 insertions, 10 deletions
diff --git a/ipalib/__init__.py b/ipalib/__init__.py index 788fc8ead..4bf4a8788 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -897,6 +897,8 @@ if version_info[3] == 'final': else: __version__ = '%d.%d.%d.%s.%d' % version_info +Registry = plugable.Registry + class API(plugable.API): bases = (Command, Object, Method, Backend, Updater) diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index 54487eded..54c661133 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -410,7 +410,7 @@ class hbacrule_disable(LDAPQuery): ) - +# @register() class hbacrule_add_accesstime(LDAPQuery): """ Add an access time to an HBAC rule. @@ -449,9 +449,8 @@ class hbacrule_add_accesstime(LDAPQuery): ) ) -#api.register(hbacrule_add_accesstime) - +# @register() class hbacrule_remove_accesstime(LDAPQuery): """ Remove access time to HBAC rule. @@ -489,8 +488,6 @@ class hbacrule_remove_accesstime(LDAPQuery): ) ) -#api.register(hbacrule_remove_accesstime) - @register() class hbacrule_add_user(LDAPAddMember): diff --git a/ipalib/plugins/rpcclient.py b/ipalib/plugins/rpcclient.py index 6010b8dda..af2bc38d4 100644 --- a/ipalib/plugins/rpcclient.py +++ b/ipalib/plugins/rpcclient.py @@ -23,12 +23,15 @@ RPC client plugins. """ -from ipalib import api +from ipalib import Registry, api + +register = Registry() + if 'in_server' in api.env and api.env.in_server is False: from ipalib.rpc import xmlclient, jsonclient - api.register(xmlclient) - api.register(jsonclient) + register()(xmlclient) + register()(jsonclient) # FIXME: api.register only looks at the class name, so we need to create # trivial subclasses with the desired name. @@ -37,14 +40,14 @@ if 'in_server' in api.env and api.env.in_server is False: class rpcclient(xmlclient): """xmlclient renamed to 'rpcclient'""" pass - api.register(rpcclient) + register()(rpcclient) elif api.env.rpc_protocol == 'jsonrpc': class rpcclient(jsonclient): """jsonclient renamed to 'rpcclient'""" pass - api.register(rpcclient) + register()(rpcclient) else: raise ValueError('unknown rpc_protocol: %s' % api.env.rpc_protocol) |