From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Wed, 8 Feb 2012 14:32:11 +0000 (+0100)
Subject: Bugfix, asking ressources without filter was bugged. NT.
X-Git-Tag: sfa-2.1-24~3^2~223
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=58bb8560ad3cd922587621565543440f68ffbfe2

Bugfix, asking ressources without filter was bugged. NT.
---

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index fb4e746b..6889985e 100644
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -145,13 +145,15 @@ class SlabAggregate:
         if slice and 'node_ids' in slice and slice['node_ids']:
             filter['hostname'] = slice['node_ids']
             tags_filter=filter.copy()
-        
+            nodes = self.driver.GetNodes(filter['hostname'])
+        else :
+            nodes = self.driver.GetNodes()
         #geni_available = options.get('geni_available')    
         #if geni_available:
             #filter['boot_state'] = 'boot'     
         print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links filter %s \r\n \r\n \t slivers %s" %(filter, slivers)
         #filter.update({'peer_id': None})
-        nodes = self.driver.GetNodes(filter['hostname'])
+        #nodes = self.driver.GetNodes(filter['hostname'])
         print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes)
         
         #site_ids = []