From: Barış Metin Date: Mon, 3 May 2010 11:18:31 +0000 (+0000) Subject: xmlprotocol.get_server doesn't accept the fourth (protocol) argument. X-Git-Tag: sfa-0.9-11~6^2~17 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7efd667e9bd59a84c2b1bff354661ac3d2a8ef37 xmlprotocol.get_server doesn't accept the fourth (protocol) argument. --- diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 8bade43f..ce1f649b 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -782,7 +782,7 @@ class Sfi: raise Exception, "No such aggregate %s" % opts.aggregate aggregate = aggregates[0] url = "http://%s:%s" % (aggregate['addr'], aggregate['port']) - server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file, self.options.protocol) + server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file) return server.create_slice(slice_cred, slice_hrn, rspec) # get a ticket for the specified slice @@ -799,7 +799,7 @@ class Sfi: raise Exception, "No such aggregate %s" % opts.aggregate aggregate = aggregates[0] url = "http://%s:%s" % (aggregate['addr'], aggregate['port']) - server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file, self.options.protocol) + server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file) ticket_string = server.get_ticket(slice_cred, slice_hrn, rspec) file = os.path.join(self.options.sfi_dir, get_leaf(slice_hrn) + ".ticket") print "writing ticket to ", file