git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ff64f9
)
xmlprotocol.get_server doesn't accept the fourth (protocol) argument.
author
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 3 May 2010 11:18:31 +0000
(11:18 +0000)
committer
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 3 May 2010 11:18:31 +0000
(11:18 +0000)
sfa/client/sfi.py
patch
|
blob
|
history
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
index
8bade43
..
ce1f649
100755
(executable)
--- 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'])
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
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'])
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
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