Merge remote-tracking branch 'origin/master' into amarisoft

Conflicts:
	slapos/format.py
	slapos/tests/slapformat.py

slapos/format.py

@@ -61,12 +61,14 @@ from slapos.util import mkdir_p
 import slapos.slap as slap
 from slapos import version
 
+
 logger = logging.getLogger("slapos.format")
 
 # dict[str: ManagerClass] used in configuration and XML dump of computer
 # this dictionary is intended to be filled after each definition of a Manager
 available_managers = {}
 
+
 def prettify_xml(xml):
   root = lxml.etree.fromstring(xml)
   return lxml.etree.tostring(root, pretty_print=True)

slapos/proxy/views.py

@@ -554,17 +554,21 @@ def getAllocatedSlaveInstance(slave_reference, requested_computer_id):
   return execute_db(table, q, args, one=True)
 
 def getRootPartition(reference):
+  """Climb the partitions tree up by 'requested_by' link to get the root partition."""
   p = 'SELECT * FROM %s WHERE reference=?'
-  parent_partition = execute_db('partition', p, [reference], one=True)
+  partition = execute_db('partition', p, [reference], one=True)
+  if partition is None:
+    return 
 
-  while parent_partition is not None:
-    parent_reference = parent_partition['requested_by']
-    if not parent_reference or parent_reference == reference:
-      break
-    reference = parent_reference
+  parent_partition = execute_db('partition', p, [partition['requested_by']], one=True)
+  while (parent_partition is not None and
+         parent_partition['requested_by'] and
+         parent_partition['requested_by'] != reference):
+    partition = parent_partition
+    reference = parent_partition['requested_by']
     parent_partition = execute_db('partition', p, [reference], one=True)
 
-  return parent_partition
+  return partition
 
 def requestNotSlave(software_release, software_type, partition_reference, partition_id, partition_parameter_kw, filter_kw, requested_state):
   instance_xml = dict2xml(partition_parameter_kw)