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 (from parent 1:
c3d687e
)
Bugfix, asking ressources without filter was bugged. NT.
author
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 8 Feb 2012 14:32:11 +0000
(15:32 +0100)
committer
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 8 Feb 2012 14:32:11 +0000
(15:32 +0100)
sfa/senslab/slabaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slabaggregate.py
b/sfa/senslab/slabaggregate.py
index
fb4e746
..
6889985
100644
(file)
--- 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()
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})
#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 = []
print>>sys.stderr, "\r\n \r\n \t get_nodes_and_links nodes %s" %(nodes)
#site_ids = []