diff options
| -rw-r--r-- | ipaserver/rpcserver.py | 31 | ||||
| -rw-r--r-- | tests/test_ipaserver/test_rpcserver.py | 15 |
2 files changed, 24 insertions, 22 deletions
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index c2cb0bd59..55d6f2160 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -18,13 +18,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -Execute an RPC request. +RPC server. """ -from xmlrpclib import dumps, loads, Fault +from xmlrpclib import Fault from ipalib import Backend -from ipalib.errors import HandledError, CommandError -from ipalib.rpc import xml_wrap, xml_unwrap +from ipalib.errors2 import PublicError, InternalError, CommandError +from ipalib.rpc import xml_dumps, xml_loads def params_2_args_options(params): @@ -36,25 +36,28 @@ def params_2_args_options(params): return (params, dict()) -class xmlrpc(Backend): +class xmlserver(Backend): + """ + Execution backend for XML-RPC server. + """ def dispatch(self, method, params): assert type(method) is str assert type(params) is tuple - self.info('Received RPC call to %r', method) + self.debug('Received RPC call to %r', method) if method not in self.Command: raise CommandError(name=method) - (args, options) = params_2_args_options(xml_unwrap(params)) + (args, options) = params_2_args_options(params) result = self.Command[method](*args, **options) - return (xml_wrap(result),) + return (result,) # Must wrap XML-RPC response in a tuple singleton - def execute(self, data, ccache=None, client_ip=None, locale=None): + def execute(self, data, ccache=None, client_ip=None, languages=None): try: - (params, method) = loads(data) + (params, method) = xml_loads(data) response = self.dispatch(method, params) except Exception, e: - if not isinstance(e, HandledError): - e = UnknownError() - assert isinstance(e, HandledError) - response = Fault(e.code, e.message) + if not isinstance(e, PublicError): + e = InternalError() + assert isinstance(e, PublicError) + response = Fault(e.errno, e.strerror) return dumps(response) diff --git a/tests/test_ipaserver/test_rpcserver.py b/tests/test_ipaserver/test_rpcserver.py index 52db611ba..48c1d36ef 100644 --- a/tests/test_ipaserver/test_rpcserver.py +++ b/tests/test_ipaserver/test_rpcserver.py @@ -23,7 +23,7 @@ Test the `ipaserver.rpc` module. from tests.util import create_test_api, raises, PluginTester from tests.data import unicode_str -from ipalib import errors, Command +from ipalib import errors2, Command from ipaserver import rpcserver @@ -41,21 +41,20 @@ def test_params_2_args_options(): assert f((options,) + args) == ((options,) + args, dict()) -class test_xmlrpc(PluginTester): +class test_xmlserver(PluginTester): """ - Test the `ipaserver.rpcserver.xmlrpc` plugin. + Test the `ipaserver.rpcserver.xmlserver` plugin. """ - _plugin = rpcserver.xmlrpc + _plugin = rpcserver.xmlserver def test_dispatch(self): """ - Test the `ipaserver.rpcserver.xmlrpc.dispatch` method. + Test the `ipaserver.rpcserver.xmlserver.dispatch` method. """ (o, api, home) = self.instance('Backend', in_server=True) - e = raises(errors.CommandError, o.dispatch, 'echo', tuple()) - assert str(e) == "Unknown command 'echo'" - assert e.kw['name'] == 'echo' + e = raises(errors2.CommandError, o.dispatch, 'echo', tuple()) + assert e.name == 'echo' class echo(Command): takes_args = ['arg1', 'arg2+'] |