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:
1a305e2
)
rspec version must be a python dict'
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 29 Sep 2011 16:56:29 +0000
(12:56 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 29 Sep 2011 16:56:29 +0000
(12:56 -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
549fc0b
..
7b57e0f
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-114,7
+114,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():
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'] =
pg_rspec_ad_version
+ my_opts['rspec_version'] =
dict(pg_rspec_ad_version)
rspec = server.ListResources(*args)
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except Exception, e:
rspec = server.ListResources(*args)
return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
except Exception, e: