From: Tony Mack Date: Tue, 27 Sep 2011 00:48:03 +0000 (-0400) Subject: ListResounces will only return the nodes a sliver has allocated X-Git-Tag: sfa-1.1-1~183^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=df395fe20045551d7e460881e8fb982dc96a25f4;p=sfa.git ListResounces will only return the nodes a sliver has allocated --- diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index 8f6335ff..ef4705ba 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -105,10 +105,13 @@ class Aggregate: # only doing this becuase protogeni rspec needs # to advertise available initscripts node['pl_initscripts'] = self.pl_initscripts - if not node['slice_ids_whitelist']: + + if slice and node['node_id'] in slice['node_ids']: valid_nodes.append(node) elif slice and slice['slice_id'] in node['slice_ids_whitelist']: valid_nodes.append(node) + elif not slice and not node['slice_ids_whitelist']: + valid_nodes.append(node) rspec.add_nodes(valid_nodes) rspec.add_interfaces(self.interfaces.values())