openstack
/
manila
Code Issues Proposed changes

Merge "Fixed policy check for manila api."

This commit is contained in:
Jenkins 2013-09-27 16:44:35 +00:00 committed by Gerrit Code Review
parent 208f51a6de 70c5541da2
commit 9eb5e22d23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/share/api.py
View File

@ -64,7 +64,7 @@ def check_policy(context, action, target_obj=None):
'project_id': context.project_id,
'user_id': context.user_id,
}
target.update(target_obj if isinstance(target_obj, dict) else {})
target.update(target_obj or {})
_action = 'share:%s' % action
manila.policy.enforce(context, _action, target)
@ -77,11 +77,10 @@ class API(base.Base):
self.share_rpcapi = share_rpcapi.ShareAPI()
super(API, self).__init__(db_driver)
@wrap_check_policy
def create(self, context, share_proto, size, name, description,
snapshot=None, availability_zone=None):
"""Create new share."""
check_policy(context, 'create')
if snapshot is not None:
if snapshot['status'] != 'available':
msg = _('status must be available')