From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 18 Nov 2006 18:15:55 +0000 (+0000)
Subject: pass cacert and timeout to safexmlrpc init
X-Git-Tag: planetlab-4_0-rc1~43
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=1d88acf427c819b0dcb408372637f300c4dfdba7

pass cacert and timeout to safexmlrpc init
---

diff --git a/plcapi.py b/plcapi.py
index e89663d..86d04c9 100644
--- a/plcapi.py
+++ b/plcapi.py
@@ -15,7 +15,7 @@ class PLCAPI:
     the new session-based method.
     """
 
-    def __init__(self, uri, auth, **kwds):
+    def __init__(self, uri, cacert, auth, timeout = 300, **kwds):
         if isinstance(auth, (tuple, list)):
             (self.node_id, self.key) = auth
             self.session = None
@@ -23,7 +23,7 @@ class PLCAPI:
             self.node_id = self.key = None
             self.session = auth
 
-        self.server = safexmlrpc.ServerProxy(uri, allow_none = 1, **kwds)
+        self.server = safexmlrpc.ServerProxy(uri, cacert, timeout, allow_none = 1, **kwds)
 
     def add_auth(self, function):
         """