Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

Conflicts:
	sfa/senslab/slabaggregate.py

diff --cc sfa/senslab/slabaggregate.py
index 7737aab,ca9c496..f8ce7a3
--- 1/sfa/senslab/slabaggregate.py
--- 2/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@@ -209,13 -209,11 +209,14 @@@ class SlabAggregate
              # do not include boot state (<available> element) in the manifest rspec
              if not slice:     
                  rspec_node['boot_state'] = node['boot_state']
-             rspec_node['exclusive'] = 'true'
-             rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})]
 +                if node['hostname'] in reserved_nodes:
 +                    rspec_node['boot_state'] = "Reserved"
+             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
+             #rspec_node['pl_initscripts'] = None
              # add site/interface info to nodes.
              # assumes that sites, interfaces and tags have already been prepared.
              #site = sites_dict[node['site_id']]

diff --cc sfa/senslab/slabdriver.py
Simple merge