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
support GENI v2 API 'options' argument for all Aggregate API methods
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_eucalyptus.py
diff --git
a/sfa/managers/aggregate_manager_eucalyptus.py
b/sfa/managers/aggregate_manager_eucalyptus.py
index
3f2d512
..
ff2428c
100644
(file)
--- a/
sfa/managers/aggregate_manager_eucalyptus.py
+++ b/
sfa/managers/aggregate_manager_eucalyptus.py
@@
-444,7
+444,8
@@
class AggregateManagerEucalyptus:
port=eucaPort,
path=srvPath)
port=eucaPort,
path=srvPath)
- def ListResources(api, creds, options, call_id):
+ def ListResources(api, creds, options={}):
+ call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
@@
-540,7
+541,8
@@
class AggregateManagerEucalyptus:
"""
Hook called via 'sfi.py create'
"""
"""
Hook called via 'sfi.py create'
"""
- def CreateSliver(api, slice_xrn, creds, xml, users, call_id):
+ def CreateSliver(api, slice_xrn, creds, xml, users, options={}):
+ call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
logger = logging.getLogger('EucaAggregate')
if Callids().already_handled(call_id): return ""
logger = logging.getLogger('EucaAggregate')
@@
-677,7
+679,7
@@
class AggregateManagerEucalyptus:
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
- def GetVersion(api):
+ def GetVersion(api
, options={}
):
version_manager = VersionManager()
ad_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []