From 2d458a12339fbb7ef006ff7defc1e2f541e2f23f Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Mon, 24 Nov 2008 21:34:01 -0700 Subject: Stared some RPC-related error cleanup; started work on ipa_server.rcp.xmlrpc plugin --- ipa_server/rpc.py | 37 +++++++++++++++++++++++++++++++++++++ ipa_server/rpcserver.py | 32 -------------------------------- 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 ipa_server/rpc.py delete mode 100644 ipa_server/rpcserver.py (limited to 'ipa_server') diff --git a/ipa_server/rpc.py b/ipa_server/rpc.py new file mode 100644 index 00000000..51007134 --- /dev/null +++ b/ipa_server/rpc.py @@ -0,0 +1,37 @@ +# Authors: +# Jason Gerard DeRose +# +# Copyright (C) 2008 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 only +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +""" +Dispatcher for RPC server. +""" + +from ipalib import Backend +from ipalib.errors import CommandError +from ipalib.rpc import xmlrpc_wrap, xmlrpc_unwrap + + +class xmlrpc(Backend): + + def dispatch(self, method, params): + assert type(method) is str + assert type(params) is tuple + self.info('Received RPC call to %r', method) + if method not in self.Command: + raise CommandError(name=method) + params = xml_unwrap(params) diff --git a/ipa_server/rpcserver.py b/ipa_server/rpcserver.py deleted file mode 100644 index 1fbbf4aa..00000000 --- a/ipa_server/rpcserver.py +++ /dev/null @@ -1,32 +0,0 @@ -# Authors: -# Jason Gerard DeRose -# -# Copyright (C) 2008 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 only -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -""" -Dispatcher for RPC server. -""" - -from ipalib import Backend -from ipalib.rpc import xmlrpc_wrap, xmlrpc_unwrap - - -class XMLServer(Backend): - - def dispatch(self, method, params): - self.info('Received call to %r', method) - params = xml_unwrap(params) -- cgit