diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_destroyComputerPartition.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_destroyComputerPartition.xml index 170b48f474e858f306277fe7b4b8db5ffafacceb..03ec455ec2c4c73f94f6f58e25e9cefd084d7b59 100644 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_destroyComputerPartition.xml +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_destroyComputerPartition.xml @@ -50,7 +50,10 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string># deliver proper packing list\n + <value> <string>software_instance = state_change[\'object\']\n +# mark destroy is requested\n +software_instance.destroyRequested()\n +# deliver proper packing list\n packing_list_line = context.SoftwareInstance_getInstanceDestroyPackingListLine(state_change)\n packing_list = packing_list_line.getParentValue()\n if packing_list.getPortalObject().portal_workflow.isTransitionPossible(packing_list, \'start\'):\n @@ -59,7 +62,6 @@ if packing_list.getPortalObject().portal_workflow.isTransitionPossible(packing_l packing_list.deliver()\n \n # revoke certificate\n -software_instance = state_change[\'object\']\n try:\n context.getPortalObject().portal_certificate_authority\\\n .revokeCertificate(software_instance.getDestinationReference())\n diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/destroy_requested.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/destroy_requested.xml new file mode 100644 index 0000000000000000000000000000000000000000..d0d15e96edcc2212c4eeb998dcda948c7c4c76a0 --- /dev/null +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/destroy_requested.xml @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="StateDefinition" module="Products.DCWorkflow.States"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>destroy_requested</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple> + <string>destroy_computer_partition</string> + <string>destroy_requested</string> + <string>report_computer_partition_error</string> + <string>request_computer_partition</string> + <string>request_destroy_computer_partition</string> + <string>request_destroy_computer_partition_action</string> + <string>request_software_instance</string> + <string>request_start_computer_partition</string> + <string>request_start_computer_partition_action</string> + <string>request_stop_computer_partition</string> + <string>request_stop_computer_partition_action</string> + <string>start_computer_partition</string> + <string>start_computer_partition_installation</string> + <string>start_requested</string> + <string>stop_computer_partition</string> + <string>stop_computer_partition_installation</string> + <string>stop_requested</string> + <string>update_slave_partition_list</string> + </tuple> + </value> + </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/draft.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/draft.xml index a85028995215cb59082b6215abf6c091d68d0bb2..1c38b5d2148e1c40faa0d3edafb03d1f58f07c7d 100644 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/draft.xml +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/draft.xml @@ -23,6 +23,7 @@ <value> <tuple> <string>destroy_computer_partition</string> + <string>destroy_requested</string> <string>report_computer_partition_error</string> <string>request_computer_partition</string> <string>request_destroy_computer_partition</string> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/start_requested.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/start_requested.xml index 924e765e10d2841c336d4cb8c9feef4fd818a049..d857a8d0e4bc27da49056ad975885270ec25fe58 100644 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/start_requested.xml +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/start_requested.xml @@ -23,6 +23,7 @@ <value> <tuple> <string>destroy_computer_partition</string> + <string>destroy_requested</string> <string>report_computer_partition_error</string> <string>request_computer_partition</string> <string>request_destroy_computer_partition</string> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/stop_requested.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/stop_requested.xml index 5ff71c0c8b3687b5b46876d9e7a3cfbe66ca2b62..80e52e0a5fe70b1be15d4ffe2d809c2476cbf2c6 100644 --- a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/stop_requested.xml +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/states/stop_requested.xml @@ -23,6 +23,7 @@ <value> <tuple> <string>destroy_computer_partition</string> + <string>destroy_requested</string> <string>report_computer_partition_error</string> <string>request_computer_partition</string> <string>request_destroy_computer_partition</string> diff --git a/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/transitions/destroy_requested.xml b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/transitions/destroy_requested.xml new file mode 100644 index 0000000000000000000000000000000000000000..622a1646feb1642ff14447acffb83a9585eab986 --- /dev/null +++ b/master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/transitions/destroy_requested.xml @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>destroy_requested</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>destroy_requested</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_base/bt/revision b/master/bt5/vifib_base/bt/revision index a9d8b73e699feec67a98221332b994952c6c8ad8..ce83bd94b3310d442003750e2bf8e7f2e28da90a 100644 --- a/master/bt5/vifib_base/bt/revision +++ b/master/bt5/vifib_base/bt/revision @@ -1 +1 @@ -257 \ No newline at end of file +258 \ No newline at end of file diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml index 07df538c53a5354b956851a8eecdfd20626b88ac..6bed9de2dfdd3097e6ca76cf7f2673ee1a9b36a4 100644 --- a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml +++ b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_requestStoredSoftwareInstanceState.xml @@ -63,6 +63,8 @@ if resource == preference_tool.getPreferredInstanceSetupResource():\n software_instance.requestStartComputerPartition()\n elif software_instance.getSlapState() == \'stop_requested\':\n software_instance.requestStopComputerPartition()\n + elif software_instance.getSlapState() == \'destroy_requested\':\n + software_instance.requestDestroyComputerPartition()\n </string> </value> </item> <item> diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index 6d540e9f236101856eb2bf19a40e20084d6afd26..be6c136492c29e96d1d42c240ce1fe2d5f9d302c 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -382 \ No newline at end of file +383 \ No newline at end of file