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:
7ad7426
)
manifest rspec for a slice that doesn't exist should be empyt
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 14 Sep 2012 01:29:20 +0000
(21:29 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 14 Sep 2012 01:29:20 +0000
(21:29 -0400)
sfa/planetlab/plaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/planetlab/plaggregate.py
b/sfa/planetlab/plaggregate.py
index
f838bed
..
b22a94b
100644
(file)
--- a/
sfa/planetlab/plaggregate.py
+++ b/
sfa/planetlab/plaggregate.py
@@
-304,7
+304,10
@@
class PlAggregate:
rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires'])))
if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases':
rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires'])))
if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases':
- nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers, options)
+ if slice_xrn and not slivers:
+ nodes, links = [], []
+ else:
+ nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers, options)
rspec.version.add_nodes(nodes)
rspec.version.add_links(links)
# add sliver defaults
rspec.version.add_nodes(nodes)
rspec.version.add_links(links)
# add sliver defaults