X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=safexmlrpc.py;h=71799ff2e2169e4e72d9bee610e078c73a05102d;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=96865dfd8518d08132fec505ad22ded603319c87;hpb=b0deb4f91ea673181a2db5ee432f8d9c36fc7312;p=nodemanager.git

diff --git a/safexmlrpc.py b/safexmlrpc.py
index 96865df..71799ff 100644
--- a/safexmlrpc.py
+++ b/safexmlrpc.py
@@ -1,24 +1,27 @@
 """Leverage curl to make XMLRPC requests that check the server's credentials."""
 
-from subprocess import PIPE, Popen
+import curlwrapper
 import xmlrpclib
 
 
-CURL = '/usr/bin/curl'
-
 class CertificateCheckingSafeTransport(xmlrpclib.Transport):
+    def __init__(self, cacert, timeout):
+        self.cacert = cacert
+        self.timeout = timeout
+
     def request(self, host, handler, request_body, verbose=0):
         self.verbose = verbose
-        p = Popen((CURL, '--cacert', '/usr/boot/cacert.pem', '--data', '@-', 'https://%s%s' % (host, handler)), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        p.stdin.write(request_body)
-        p.stdin.close()
-        contents = p.stdout.read()
-        p.stdout.close()
-        error = p.stderr.read()
-        p.stderr.close()
-        rc = p.wait()
-        if rc != 0: raise xmlrpclib.ProtocolError(host + handler, rc, error, '')
-        return xmlrpclib.loads(contents)[0]
+        try:
+            contents = curlwrapper.retrieve('https://%s%s' % (host, handler),
+                                            cacert = self.cacert,
+                                            postdata = request_body,
+                                            timeout = self.timeout)
+            return xmlrpclib.loads(contents)[0]
+        except curlwrapper.CurlException, e:
+            raise xmlrpclib.ProtocolError(host + handler, -1, str(e), '')
 
 class ServerProxy(xmlrpclib.ServerProxy):
-    def __init__(self, handler, *args, **kw_args): xmlrpclib.ServerProxy.__init__(self, handler, CertificateCheckingSafeTransport())
+    def __init__(self, uri, cacert, timeout = 300, **kwds):
+        xmlrpclib.ServerProxy.__init__(self, uri,
+                                       CertificateCheckingSafeTransport(cacert, timeout),
+                                       **kwds)