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:
84dc999
)
fix requested version when calling ListResources() at ProtoGENI aggregates
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 3 Oct 2011 20:24:31 +0000
(16:24 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 3 Oct 2011 20:24:31 +0000
(16:24 -0400)
sfa/managers/slice_manager_pl.py
patch
|
blob
|
history
diff --git
a/sfa/managers/slice_manager_pl.py
b/sfa/managers/slice_manager_pl.py
index
01b3b55
..
101708f
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-118,7
+118,7
@@
def ListResources(api, creds, options, call_id):
version = api.get_cached_server_version(server)
# force ProtoGENI aggregates to give us a v2 RSpec
if 'sfa' not in version.keys():
- my_opts['rspec_version'] = version_manager.get_version('ProtoGENI
1'
)
+ my_opts['rspec_version'] = version_manager.get_version('ProtoGENI
2').to_dict(
)
rspec = server.ListResources(*args)
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except Exception, e: