Merge branch 'upstreammaster'

[sfa.git] / sfa / plc / plaggregate.py

diff --git a/sfa/plc/plaggregate.py b/sfa/plc/plaggregate.py
index 1cace7a..b84dac4 100644 (file)
--- a/sfa/plc/plaggregate.py
+++ b/sfa/plc/plaggregate.py
@@ -135,7 +135,13 @@ 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 slice_xrn:
+            if not slice or not slice['node_ids']:
+                return ([],[])
+
         filter = {}
         tags_filter = {}
         if slice and 'node_ids' in slice and slice['node_ids']:
@@ -243,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)