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
update get_rspec() to accept creds, and options params
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_pl.py
diff --git
a/sfa/managers/aggregate_manager_pl.py
b/sfa/managers/aggregate_manager_pl.py
index
6a6a03b
..
da5c337
100644
(file)
--- a/
sfa/managers/aggregate_manager_pl.py
+++ b/
sfa/managers/aggregate_manager_pl.py
@@
-270,13
+270,11
@@
def get_rspec(api, creds, options):
xrn = options.get('geni_slice_urn', None)
hrn, type = urn_to_hrn(xrn)
xrn = options.get('geni_slice_urn', None)
hrn, type = urn_to_hrn(xrn)
- """
# look in cache first
if api.cache and not xrn:
rspec = api.cache.get('nodes')
if rspec:
return rspec
# look in cache first
if api.cache and not xrn:
rspec = api.cache.get('nodes')
if rspec:
return rspec
- """
registry = api.registries[api.hrn]
credential = api.getCredential()
registry = api.registries[api.hrn]
credential = api.getCredential()
@@
-291,11
+289,10
@@
def get_rspec(api, creds, options):
rspec = network.toxml()
rspec = network.toxml()
- """
# cache the result
if api.cache and not xrn:
api.cache.add('nodes', rspec)
# cache the result
if api.cache and not xrn:
api.cache.add('nodes', rspec)
- """
+
return rspec
return rspec