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:
699e5aa
)
in redeem_ticket() - no need to require rspec as a command arguemt, get rspec from...
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 20 Nov 2009 19:51:05 +0000
(19:51 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 20 Nov 2009 19:51:05 +0000
(19:51 +0000)
sfa/client/sfi.py
patch
|
blob
|
history
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
index
5a2467d
..
ed884ea
100755
(executable)
--- a/
sfa/client/sfi.py
+++ b/
sfa/client/sfi.py
@@
-824,18
+824,19
@@
class Sfi:
ticket.save_to_file(filename=file, save_parents=True)
def redeem_ticket(self, opts, args):
ticket.save_to_file(filename=file, save_parents=True)
def redeem_ticket(self, opts, args):
- ticket_file
, rspec_file = args[0], args[1
]
+ ticket_file
= args[0
]
# get slice hrn from the ticket
# get slice hrn from the ticket
+ # use this to get the right slice credential
ticket = SfaTicket(filename=ticket_file)
ticket.decode()
ticket = SfaTicket(filename=ticket_file)
ticket.decode()
- slice_hrn = ticket.attributes['hrn']
+ slice_hrn = ticket.attributes['
slivers'][0]['
hrn']
user_cred = self.get_user_cred()
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
# get a list node hostnames from the nodespecs in the rspec
rspec = RSpec()
user_cred = self.get_user_cred()
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
# get a list node hostnames from the nodespecs in the rspec
rspec = RSpec()
- rspec.parse
File(rspec_file
)
+ rspec.parse
String(ticket.rspec
)
nodespecs = rspec.getDictsByTagName('NodeSpec')
hostnames = [nodespec['name'] for nodespec in nodespecs]
nodespecs = rspec.getDictsByTagName('NodeSpec')
hostnames = [nodespec['name'] for nodespec in nodespecs]