change the parameter of "ERP5Site_getSlaveInstanceListFromComputerPartition"...

change the parameter of "ERP5Site_getSlaveInstanceListFromComputerPartition" to be possible to pass parameters to catalog search

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/ERP5Site_getSlaveInstanceListFromComputerPartition.xml

@@ -63,10 +63,7 @@ sale_packing_list_line = portal.portal_catalog.getResultValue(\n
 computer_partition = sale_packing_list_line.getAggregateValue(\n
   portal_type="Computer Partition")\n
 \n
-slave_instance_query = ComplexQuery(\n
-  Query(aggregate_portal_type="Slave Instance"),\n
-  Query(aggregate_validation_state=state_list),\n
-  operator="AND")\n
+slave_instance_query = Query(aggregate_portal_type="Slave Instance")\n
 \n
 computer_partition_query = Query(\n
   aggregate_relative_url=computer_partition.getRelativeUrl())\n
@@ -74,9 +71,6 @@ computer_partition_query = Query(\n
 query = ComplexQuery(computer_partition_query, \n
   slave_instance_query, operator="AND")\n
 \n
-kw = {}\n
-if simulation_state is not None:\n
-  kw["simulation_state"] = simulation_state\n
 return portal.portal_catalog(portal_type=\'Sale Packing List Line\',\n
                              default_resource_uid=service_uid_list,\n
                              sort_on=((\'movement.start_date\', \'DESC\'),),\n
@@ -85,7 +79,7 @@ return portal.portal_catalog(portal_type=\'Sale Packing List Line\',\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>relative_url, service_relative_url, state_list, simulation_state=None</string> </value>
+            <value> <string>relative_url, service_relative_url, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_deliverSlaveInstanceListFromComputerPartition.xml

@@ -55,8 +55,7 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceHostingResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url,\n
- ["%requested", "started"], "stopped")\n
+ software_instance.getRelativeUrl(), service_relative_url, simulation_state=["stopped"])\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_requestStartSlaveInstanceListFromComputerPartition.xml

@@ -55,11 +55,15 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceHostingResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "stopped"])\n
+ software_instance.getRelativeUrl(), service_relative_url)\n
+\n
+slave_instance_uid_list = []\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n
+  if slave_instance.getUid() not in slave_instance_uid_list:\n
     slave_instance.requestStartComputerPartition()\n
+    slave_instance_uid_list.append(slave_instance.getUid())\n
 </string> </value>
         </item>
         <item>

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_requestStopSlaveInstanceListFromComputerPartition.xml

@@ -55,7 +55,8 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceHostingResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "started"])\n
+ software_instance.getRelativeUrl(), service_relative_url,\n
+ simulation_state=["confirmed", "started"])\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_startComputerPartitionInstallationOfSlaveInstanceListFromComputerPartition.xml

@@ -55,7 +55,7 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceSetupResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "stopped"])\n
+ software_instance.getRelativeUrl(), service_relative_url)\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_startSlaveInstanceListFromComputerPartition.xml

@@ -55,7 +55,7 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceHostingResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "stopped"])\n
+ software_instance.getRelativeUrl(), service_relative_url)\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_stopComputerPartitionInstallationOfSlaveInstanceListFromComputerPartition.xml

@@ -54,7 +54,7 @@
 service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceSetupResource()\n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "started"])\n
+ software_instance.getRelativeUrl(), service_relative_url)\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_stopSlaveInstanceListFromComputerPartition.xml

@@ -55,7 +55,7 @@ service_relative_url = software_instance.portal_preferences.\\\n
                             getPreferredInstanceHostingResource()\n
 \n
 sale_packing_list_line_list = context.ERP5Site_getSlaveInstanceListFromComputerPartition(\n
- software_instance.getRelativeUrl(), service_relative_url, ["%requested", "started"])\n
+ software_instance.getRelativeUrl(), service_relative_url)\n
 \n
 for sale_packing_list_line in sale_packing_list_line_list:\n
   slave_instance = sale_packing_list_line.getAggregateValue(portal_type="Slave Instance")\n