From 4d2ca8b5aca0f3c523190c91ef2cea3fc3f373b7 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Thu, 25 Oct 2012 10:25:12 +0200 Subject: [PATCH] Migrate computer_partition_slap_interface_workflow into slapos_cloud --- .../workflow_chain_type.xml | 4 ++++ .../computer_partition_slap_interface_workflow.xml | 0 .../computer_partition_slap_interface_workflow/scripts.xml | 0 .../computer_partition_slap_interface_workflow/states.xml | 0 .../states/busy.xml | 0 .../states/draft.xml | 0 .../states/free.xml | 0 .../states/inactive.xml | 0 .../transitions.xml | 0 .../transitions/mark_busy.xml | 0 .../transitions/mark_free.xml | 0 .../transitions/mark_free_action.xml | 0 .../transitions/mark_inactive.xml | 0 .../transitions/mark_inactive_action.xml | 0 .../computer_partition_slap_interface_workflow/variables.xml | 0 .../variables/action.xml | 0 .../variables/actor.xml | 0 .../variables/comment.xml | 0 .../variables/error_message.xml | 0 .../variables/history.xml | 0 .../variables/portal_type.xml | 0 .../variables/time.xml | 0 .../computer_partition_slap_interface_workflow/worklists.xml | 0 master/bt5/slapos_cloud/bt/revision | 2 +- .../slapos_cloud/bt/template_portal_type_workflow_chain_list | 1 + master/bt5/slapos_cloud/bt/template_workflow_id_list | 1 + .../workflow_chain_type.xml | 2 +- master/bt5/vifib_slap/bt/revision | 2 +- .../vifib_slap/bt/template_portal_type_workflow_chain_list | 1 - master/bt5/vifib_slap/bt/template_workflow_id_list | 1 - 30 files changed, 9 insertions(+), 5 deletions(-) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/scripts.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/busy.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/draft.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/free.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/inactive.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_busy.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free_action.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive_action.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/action.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/actor.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/comment.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/error_message.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/history.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/portal_type.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/time.xml (100%) rename master/bt5/{vifib_slap => slapos_cloud}/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/worklists.xml (100%) diff --git a/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 3c41ddfd0..95735c4ed 100644 --- a/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,4 +1,8 @@ <workflow_chain> + <chain> + <type>Computer Partition</type> + <workflow>computer_partition_slap_interface_workflow</workflow> + </chain> <chain> <type>Hosting Subscription</type> <workflow>edit_workflow, instance_slap_interface_workflow</workflow> diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/scripts.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/scripts.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/scripts.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/scripts.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/busy.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/busy.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/busy.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/busy.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/draft.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/draft.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/draft.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/draft.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/free.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/free.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/free.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/free.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/inactive.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/inactive.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/inactive.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/states/inactive.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_busy.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_busy.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_busy.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_busy.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free_action.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free_action.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free_action.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_free_action.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive_action.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive_action.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive_action.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/transitions/mark_inactive_action.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/action.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/action.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/action.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/action.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/actor.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/actor.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/actor.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/actor.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/comment.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/comment.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/comment.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/comment.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/error_message.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/error_message.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/error_message.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/error_message.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/history.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/history.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/history.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/history.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/portal_type.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/portal_type.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/portal_type.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/portal_type.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/time.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/time.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/time.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/variables/time.xml diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/worklists.xml b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/worklists.xml similarity index 100% rename from master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/worklists.xml rename to master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_partition_slap_interface_workflow/worklists.xml diff --git a/master/bt5/slapos_cloud/bt/revision b/master/bt5/slapos_cloud/bt/revision index 24af08a48..3ca9062a1 100644 --- a/master/bt5/slapos_cloud/bt/revision +++ b/master/bt5/slapos_cloud/bt/revision @@ -1 +1 @@ -83 \ No newline at end of file +84 \ No newline at end of file diff --git a/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list b/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list index 46b4cd8b3..0ec5305bb 100644 --- a/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list +++ b/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list @@ -1,3 +1,4 @@ +Computer Partition | computer_partition_slap_interface_workflow Hosting Subscription | edit_workflow Hosting Subscription | instance_slap_interface_workflow Person | person_slap_interface_workflow diff --git a/master/bt5/slapos_cloud/bt/template_workflow_id_list b/master/bt5/slapos_cloud/bt/template_workflow_id_list index 0fc42d462..3b1bc5452 100644 --- a/master/bt5/slapos_cloud/bt/template_workflow_id_list +++ b/master/bt5/slapos_cloud/bt/template_workflow_id_list @@ -1,3 +1,4 @@ +computer_partition_slap_interface_workflow installation_slap_interface_workflow instance_slap_interface_workflow person_slap_interface_workflow \ No newline at end of file diff --git a/master/bt5/vifib_slap/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/vifib_slap/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 430ec7c99..ffef39758 100644 --- a/master/bt5/vifib_slap/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/master/bt5/vifib_slap/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -9,7 +9,7 @@ </chain> <chain> <type>Computer Partition</type> - <workflow>computer_partition_slap_interface_workflow, slap_interaction_workflow</workflow> + <workflow>slap_interaction_workflow</workflow> </chain> <chain> <type>Hosting Subscription</type> diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index c5316a94d..9a943a236 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -848 \ No newline at end of file +849 \ No newline at end of file diff --git a/master/bt5/vifib_slap/bt/template_portal_type_workflow_chain_list b/master/bt5/vifib_slap/bt/template_portal_type_workflow_chain_list index 7ecee7234..e6a49d45b 100644 --- a/master/bt5/vifib_slap/bt/template_portal_type_workflow_chain_list +++ b/master/bt5/vifib_slap/bt/template_portal_type_workflow_chain_list @@ -1,5 +1,4 @@ Assignment | slap_interaction_workflow -Computer Partition | computer_partition_slap_interface_workflow Computer Partition | slap_interaction_workflow Computer | computer_slap_interface_workflow Hosting Subscription | slap_interaction_workflow diff --git a/master/bt5/vifib_slap/bt/template_workflow_id_list b/master/bt5/vifib_slap/bt/template_workflow_id_list index 110b9ee75..1615c47ac 100644 --- a/master/bt5/vifib_slap/bt/template_workflow_id_list +++ b/master/bt5/vifib_slap/bt/template_workflow_id_list @@ -1,3 +1,2 @@ -computer_partition_slap_interface_workflow computer_slap_interface_workflow slap_interaction_workflow \ No newline at end of file -- 2.30.9