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:
1b8a06b
)
fix bug in get_rspec
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 8 Mar 2012 20:16:07 +0000
(15:16 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 8 Mar 2012 20:16:07 +0000
(15:16 -0500)
sfa/plc/plaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/plc/plaggregate.py
b/sfa/plc/plaggregate.py
index
b0c78d1
..
b84dac4
100644
(file)
--- a/
sfa/plc/plaggregate.py
+++ b/
sfa/plc/plaggregate.py
@@
-135,11
+135,12
@@
class PlAggregate:
return (slice, slivers)
return (slice, slivers)
- def get_nodes_and_links(self, slice=None,slivers=[], options={}):
+ def get_nodes_and_links(self, slice
_xrn, slice
=None,slivers=[], options={}):
# if we are dealing with a slice that has no node just return
# and empty list
# if we are dealing with a slice that has no node just return
# and empty list
- if not slice or not slice['node_ids']:
- return ([],[])
+ if slice_xrn:
+ if not slice or not slice['node_ids']:
+ return ([],[])
filter = {}
tags_filter = {}
filter = {}
tags_filter = {}
@@
-248,7
+249,7
@@
class PlAggregate:
if slice and 'expires' in slice:
rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires'])))
if slice and 'expires' in slice:
rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires'])))
- nodes, links = self.get_nodes_and_links(slice, slivers)
+ nodes, links = self.get_nodes_and_links(slice
_xrn, slice
, slivers)
rspec.version.add_nodes(nodes)
rspec.version.add_links(links)
rspec.version.add_nodes(nodes)
rspec.version.add_links(links)