slapos_cloud&accounting: Improvements on Alarm's queries

  Contributed by Romain.

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/Alarm_buildSlapOSPath.py

@@ -2,7 +2,8 @@ kw = {}
 select_dict= {'delivery_uid': None}
 kw.update(
   portal_type='Simulation Movement',
-  select_dict=select_dict,
+  # This is an optimisation to help mariadb selecting a better index
+  simulation_state=['draft', 'planned', None],
   left_join_list=select_dict.keys(),
   delivery_uid=None
 )

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_allocateInstance.py

 portal = context.getPortalObject()
 select_dict= {'default_aggregate_uid': None}
 portal.portal_catalog.searchAndActivate(
-  portal_type=('Slave Instance', 'Software Instance'),
+  parent_uid=context.getPortalObject().software_instance_module.getUid(),
   validation_state='validated',
   default_aggregate_uid=None,
-  select_dict=select_dict,
   left_join_list=select_dict.keys(),
 
   method_id='SoftwareInstance_tryToAllocatePartition',

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_searchComputerPartitionAndMarkFree.py

 portal = context.getPortalObject()
 
 portal.portal_catalog.searchAndActivate(
-  portal_type=["Software Instance", "Slave Instance"],
-  default_aggregate_relative_url="computer_module/%/%",
+  aggregate__uid="%",
   validation_state="invalidated",
+  slap_state="destroy_requested",
+  parent_uid=context.getPortalObject().software_instance_module.getUid(),
   method_id='SoftwareInstance_tryToUnallocatePartition',
   activate_kw={'tag': tag}
 )