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 (parent:
e26914d
)
In get_nodes_and_links function, the 'boot_state' tag of node in a rspec is set to...
author
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 28 Mar 2012 14:08:55 +0000
(16:08 +0200)
committer
Nicolas Turro
<Nicolas.Turro@inria.fr>
Wed, 28 Mar 2012 14:08:55 +0000
(16:08 +0200)
sfa/senslab/slabaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slabaggregate.py
b/sfa/senslab/slabaggregate.py
index
7063f66
..
7737aab
100644
(file)
--- a/
sfa/senslab/slabaggregate.py
+++ b/
sfa/senslab/slabaggregate.py
@@
-190,7
+190,7
@@
class SlabAggregate:
#node_tags = self.get_node_tags(tags_filter)
#links = self.get_links(sites_dict, nodes_dict, interfaces)
#node_tags = self.get_node_tags(tags_filter)
#links = self.get_links(sites_dict, nodes_dict, interfaces)
-
+ reserved_nodes=self.driver.GetReservedNodes()
rspec_nodes = []
for node in nodes:
# skip whitelisted nodes
rspec_nodes = []
for node in nodes:
# skip whitelisted nodes
@@
-209,6
+209,8
@@
class SlabAggregate:
# do not include boot state (<available> element) in the manifest rspec
if not slice:
rspec_node['boot_state'] = node['boot_state']
# do not include boot state (<available> element) in the manifest rspec
if not slice:
rspec_node['boot_state'] = node['boot_state']
+ if node['hostname'] in reserved_nodes:
+ rspec_node['boot_state'] = "Reserved"
rspec_node['exclusive'] = 'true'
rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})]
# only doing this because protogeni rspec needs
rspec_node['exclusive'] = 'true'
rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})]
# only doing this because protogeni rspec needs