From: Tony Mack Date: Thu, 8 Mar 2012 20:16:07 +0000 (-0500) Subject: fix bug in get_rspec X-Git-Tag: sfa-2.1-4~76 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eb83ed3161f1a0c750b7d4aef5ebbd46315ad07a;p=sfa.git fix bug in get_rspec --- diff --git a/sfa/plc/plaggregate.py b/sfa/plc/plaggregate.py index b0c78d11..b84dac49 100644 --- a/sfa/plc/plaggregate.py +++ b/sfa/plc/plaggregate.py @@ -135,11 +135,12 @@ class PlAggregate: 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 not slice or not slice['node_ids']: - return ([],[]) + if slice_xrn: + if not slice or not slice['node_ids']: + return ([],[]) 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']))) - 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)