openstack
/
cinder
Code Issues Proposed changes

Merge "Remove the method delete_volume_admin_metadata"

This commit is contained in:
Jenkins 2015-09-01 06:51:46 +00:00 committed by Gerrit Code Review
parent 0e1cdfb2e8 288b48ded0
commit a68e8d8a41
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/policy.json
View File

@ -11,7 +11,6 @@
"volume:delete_volume_metadata": "",
"volume:update_volume_metadata": "",
"volume:get_volume_admin_metadata": "rule:admin_api",
"volume:delete_volume_admin_metadata": "rule:admin_api",
"volume:update_volume_admin_metadata": "rule:admin_api",
"volume:delete": "",
"volume:update": "",

7
cinder/volume/api.py
View File

@ -1069,13 +1069,6 @@ class API(base.Base):
resource=volume)
return dict(rv)
@wrap_check_policy
def delete_volume_admin_metadata(self, context, volume, key):
"""Delete the given administration metadata item from a volume."""
self.db.volume_admin_metadata_delete(context, volume['id'], key)
LOG.info(_LI("Delete volume admin metadata completed successfully."),
resource=volume)
@wrap_check_policy
def update_volume_admin_metadata(self, context, volume, metadata,
delete=False):

1
etc/cinder/policy.json
View File

@ -13,7 +13,6 @@
"volume:delete_volume_metadata": "",
"volume:update_volume_metadata": "",
"volume:get_volume_admin_metadata": "rule:admin_api",
"volume:delete_volume_admin_metadata": "rule:admin_api",
"volume:update_volume_admin_metadata": "rule:admin_api",
"volume:get_snapshot": "",
"volume:get_all_snapshots": "",