openstack
/
watcher
Code Issues Proposed changes

amend delete action policy 

Change-Id: I545b969a3f0a3451b880840108484ca7ef3fabf9
This commit is contained in:
suzhengwei 2018-04-17 16:17:50 +08:00
parent 3912075c19
commit 0157fa7dad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/api/controllers/v1/audit.py
View File

@ -639,8 +639,8 @@ class AuditsController(rest.RestController):
context = pecan.request.context context = pecan.request.context
audit_to_delete = api_utils.get_resource( audit_to_delete = api_utils.get_resource(
'Audit', audit, eager=True) 'Audit', audit, eager=True)
policy.enforce(context, 'audit:update', audit_to_delete, policy.enforce(context, 'audit:delete', audit_to_delete,
action='audit:update') action='audit:delete')
initial_state = audit_to_delete.state initial_state = audit_to_delete.state
new_state = objects.audit.State.DELETED new_state = objects.audit.State.DELETED

4
watcher/api/controllers/v1/audit_template.py
View File

@ -688,8 +688,8 @@ class AuditTemplatesController(rest.RestController):
context = pecan.request.context context = pecan.request.context
audit_template_to_delete = api_utils.get_resource('AuditTemplate', audit_template_to_delete = api_utils.get_resource('AuditTemplate',
audit_template) audit_template)
policy.enforce(context, 'audit_template:update', policy.enforce(context, 'audit_template:delete',
audit_template_to_delete, audit_template_to_delete,
action='audit_template:update') action='audit_template:delete')
audit_template_to_delete.soft_delete() audit_template_to_delete.soft_delete()