git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
[sfa.git]
/
sfa
/
senslab
/
slabaggregate.py
diff --git
a/sfa/senslab/slabaggregate.py
b/sfa/senslab/slabaggregate.py
index
ca9c496
..
f8ce7a3
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,8
+209,11
@@
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-node'})]
rspec_node['exclusive'] = 'True'
rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
+
# only doing this because protogeni rspec needs
# to advertise available initscripts
#rspec_node['pl_initscripts'] = None
# only doing this because protogeni rspec needs
# to advertise available initscripts
#rspec_node['pl_initscripts'] = None