slapos_upgrader: do not fixup instance tree virtual master if one software...

slapos_upgrader: do not fixup instance tree virtual master if one software instance is in the same virtual master

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/InstanceTree_fixupSiteMigrationToVirtualMaster.py

@@ -27,8 +27,19 @@ if root_software_instance is not None:
   if root_partition is not None:
     root_instance_virtual_master_relative_url = root_partition.getParentValue().getFollowUp(None)
     if ((root_instance_virtual_master_relative_url is not None) and
-        (root_instance_virtual_master_relative_url != instance_tree_virtual_master_relative_url) and
-        (not sla_xml_dict)):
+        (root_instance_virtual_master_relative_url != instance_tree_virtual_master_relative_url)):
+      # ensure no software instance is not on the instance tree
+      # virtual master. If so, keep the instance tree virtual master
+      for sql_result in portal.portal_catalog(
+        specialise__uid=instance_tree.getUid(),
+        portal_type='Software Instance'
+      ):
+        instance = sql_result.getObject()
+        instance_partition = instance.getAggregateValue()
+        if instance_partition is not None:
+          instance_virtual_master_relative_url = instance.getParentValue().getFollowUp(None)
+          if (instance_virtual_master_relative_url == instance_tree_virtual_master_relative_url):
+            return
 
       edit_kw ={'follow_up_value': None}
       activate_kw = {'tag': tag}