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:
302a20c
)
more to do to get CreateSliver working at ProtoGeni aggregates
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 5 May 2011 20:24:25 +0000
(16:24 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 5 May 2011 20:24:25 +0000
(16:24 -0400)
sfa/client/sfi.py
patch
|
blob
|
history
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
index
bf043ac
..
f7b3d15
100755
(executable)
--- a/
sfa/client/sfi.py
+++ b/
sfa/client/sfi.py
@@
-227,6
+227,10
@@
class Sfi:
help="delegate slice credential", metavar="HRN", default=None)
if command in ("version"):
help="delegate slice credential", metavar="HRN", default=None)
if command in ("version"):
+ parser.add_option("-a", "--aggregate", dest="aggregate",
+ default=None, help="aggregate host")
+ parser.add_option("-p", "--port", dest="port",
+ default=AGGREGATE_PORT, help="aggregate port")
parser.add_option("-R","--registry-version",
action="store_true", dest="version_registry", default=False,
help="probe registry version instead of slicemgr")
parser.add_option("-R","--registry-version",
action="store_true", dest="version_registry", default=False,
help="probe registry version instead of slicemgr")
@@
-824,8
+828,7
@@
class Sfi:
creds.append(delegated_cred)
if opts.rspec_version:
call_options['rspec_version'] = opts.rspec_version
creds.append(delegated_cred)
if opts.rspec_version:
call_options['rspec_version'] = opts.rspec_version
- #result = server.ListResources(creds, call_options,unique_call_id())
- result = server.ListResources(creds, call_options)
+ result = server.ListResources(creds, call_options,unique_call_id())
format = opts.format
if opts.file is None:
display_rspec(result, format)
format = opts.format
if opts.file is None:
display_rspec(result, format)
@@
-848,8
+851,17
@@
class Sfi:
creds.append(delegated_cred)
rspec_file = self.get_rspec_file(args[1])
rspec = open(rspec_file).read()
creds.append(delegated_cred)
rspec_file = self.get_rspec_file(args[1])
rspec = open(rspec_file).read()
+
+ # TODO: need to determine if this request is going to a ProtoGENI aggregate. If so
+ # we need to obtain the keys for all users in the slice
+ # e.g.
+ # users = [
+ # { urn: urn:publicid:IDN+emulab.net+user+alice
+ # keys: [<ssh key A>, <ssh key B>]
+ # }]
+ users = []
server = self.get_server_from_opts(opts)
server = self.get_server_from_opts(opts)
- result = server.CreateSliver(slice_urn, creds, rspec,
[]
, unique_call_id())
+ result = server.CreateSliver(slice_urn, creds, rspec,
users
, unique_call_id())
print result
return result
print result
return result