openstack
/
mistral
Code Issues Proposed changes

Merge "Delete workflow members when deleting workflow"

This commit is contained in:
Jenkins 2016-02-24 09:58:08 +00:00 committed by Gerrit Code Review
parent a035e8f9dc e6f9a44c33
commit 33bb55f692
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mistral/db/v2/sqlalchemy/api.py
View File

@ -411,6 +411,9 @@ def delete_workflow_definition(identifier, session=None):
(identifier, ', '.join(cron_triggers))
)
# Delete workflow members first.
delete_resource_members(resource_type='workflow', resource_id=wf_def.id)
session.delete(wf_def)

77
mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py
View File

@ -1799,3 +1799,80 @@ class WorkflowSharingTest(SQLAlchemyTest):
fetched = db_api.get_workflow_definition(wf.id)
self.assertEqual(wf, fetched)
def test_owner_delete_shared_workflow(self):
wf = db_api.create_workflow_definition(WF_DEFINITIONS[1])
workflow_sharing = {
'resource_id': wf.id,
'resource_type': 'workflow',
'project_id': security.get_project_id(),
'member_id': user_context.project_id,
'status': 'pending',
}
db_api.create_resource_member(workflow_sharing)
# Switch to another tenant, accept the sharing.
auth_context.set_ctx(user_context)
db_api.update_resource_member(
wf.id,
'workflow',
user_context.project_id,
{'status': 'accepted'}
)
fetched = db_api.get_workflow_definition(wf.id)
self.assertEqual(wf, fetched)
# Switch to original tenant, delete the workflow.
auth_context.set_ctx(test_base.get_context())
db_api.delete_workflow_definition(wf.id)
# Switch to another tenant, can not see that workflow.
auth_context.set_ctx(user_context)
self.assertRaises(
exc.NotFoundException,
db_api.get_workflow_definition,
wf.id
)
def test_owner_delete_shared_workflow_has_crontrigger(self):
wf = db_api.create_workflow_definition(WF_DEFINITIONS[1])
workflow_sharing = {
'resource_id': wf.id,
'resource_type': 'workflow',
'project_id': security.get_project_id(),
'member_id': user_context.project_id,
'status': 'pending',
}
db_api.create_resource_member(workflow_sharing)
# Switch to another tenant, accept the sharing.
auth_context.set_ctx(user_context)
db_api.update_resource_member(
wf.id,
'workflow',
user_context.project_id,
{'status': 'accepted'}
)
# Create cron trigger using the shared workflow.
CRON_TRIGGERS[0]['workflow_id'] = wf.id
db_api.create_cron_trigger(CRON_TRIGGERS[0])
# Switch to original tenant, try to delete the workflow.
auth_context.set_ctx(test_base.get_context())
self.assertRaises(
exc.DBException,
db_api.delete_workflow_definition,
wf.id
)