git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sfi introspect
[sfa.git]
/
sfa
/
managers
/
aggregate_manager.py
diff --git
a/sfa/managers/aggregate_manager.py
b/sfa/managers/aggregate_manager.py
index
1521103
..
8b73644
100644
(file)
--- a/
sfa/managers/aggregate_manager.py
+++ b/
sfa/managers/aggregate_manager.py
@@
-29,7
+29,8
@@
class AggregateManager:
'geni_ad_rspec_versions': ad_rspec_versions,
}
'geni_ad_rspec_versions': ad_rspec_versions,
}
- def get_rspec_version_string(self, rspec_version, options={}):
+ def get_rspec_version_string(self, rspec_version, options=None):
+ if options is None: options={}
version_string = "rspec_%s" % (rspec_version)
#panos adding the info option to the caching key (can be improved)
version_string = "rspec_%s" % (rspec_version)
#panos adding the info option to the caching key (can be improved)
@@
-149,12
+150,14
@@
class AggregateManager:
return api.driver.renew(xrns, expiration_time, options)
return api.driver.renew(xrns, expiration_time, options)
- def PerformOperationalAction(self, api, xrns, creds, action, options={}):
+ def PerformOperationalAction(self, api, xrns, creds, action, options=None):
+ if options is None: options={}
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
return api.driver.perform_operational_action(xrns, action, options)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
return api.driver.perform_operational_action(xrns, action, options)
- def Shutdown(self, api, xrn, creds, options={}):
+ def Shutdown(self, api, xrn, creds, options=None):
+ if options is None: options={}
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
return api.driver.shutdown(xrn, options)
call_id = options.get('call_id')
if Callids().already_handled(call_id): return True
return api.driver.shutdown(xrn, options)