diff options
author | Ewan Mellor <ewan@xensource.com> | 2006-12-18 00:14:40 +0000 |
---|---|---|
committer | Ewan Mellor <ewan@xensource.com> | 2006-12-18 00:14:40 +0000 |
commit | 75bbf9d488782d227fb6648adb351192dba5a7b5 (patch) | |
tree | 9a6a8b2c1b9976436607787b3687986e5cc4db04 | |
parent | 6d6cd40676e6d3985d654eabb22f487cbeb168ec (diff) | |
download | xen-75bbf9d488782d227fb6648adb351192dba5a7b5.tar.gz xen-75bbf9d488782d227fb6648adb351192dba5a7b5.tar.bz2 xen-75bbf9d488782d227fb6648adb351192dba5a7b5.zip |
Fix _login to pass arguments to the server unconditionally, rather than
requiring precisely two on the client-side.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
-rw-r--r-- | tools/python/xen/xm/XenAPI.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/python/xen/xm/XenAPI.py b/tools/python/xen/xm/XenAPI.py index 1c1bc41e94..5cf929f48c 100644 --- a/tools/python/xen/xm/XenAPI.py +++ b/tools/python/xen/xm/XenAPI.py @@ -84,23 +84,23 @@ class Session(xen.util.xmlrpclib2.ServerProxy): def xenapi_request(self, methodname, params): if methodname.startswith('login'): - self._login(methodname, *params) + self._login(methodname, params) return None else: full_params = (self._session,) + params return _parse_result(getattr(self, methodname)(*full_params)) - def _login(self, method, username, password): + def _login(self, method, params): self._session = _parse_result( - getattr(self, 'session.%s' % method)(username, password)) + getattr(self, 'session.%s' % method)(*params)) def __getattr__(self, name): if name == 'xenapi': return _Dispatcher(self.xenapi_request, None) elif name.startswith('login'): - return lambda u, p: self._login(name, u, p) + return lambda *params: self._login(name, params) else: return xen.util.xmlrpclib2.ServerProxy.__getattr__(self, name) |