Merge "Remove the method delete_volume_admin_metadata"
This commit is contained in:
commit
a68e8d8a41
|
@ -11,7 +11,6 @@
|
||||||
"volume:delete_volume_metadata": "",
|
"volume:delete_volume_metadata": "",
|
||||||
"volume:update_volume_metadata": "",
|
"volume:update_volume_metadata": "",
|
||||||
"volume:get_volume_admin_metadata": "rule:admin_api",
|
"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:update_volume_admin_metadata": "rule:admin_api",
|
||||||
"volume:delete": "",
|
"volume:delete": "",
|
||||||
"volume:update": "",
|
"volume:update": "",
|
||||||
|
|
|
@ -1069,13 +1069,6 @@ class API(base.Base):
|
||||||
resource=volume)
|
resource=volume)
|
||||||
return dict(rv)
|
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
|
@wrap_check_policy
|
||||||
def update_volume_admin_metadata(self, context, volume, metadata,
|
def update_volume_admin_metadata(self, context, volume, metadata,
|
||||||
delete=False):
|
delete=False):
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
"volume:delete_volume_metadata": "",
|
"volume:delete_volume_metadata": "",
|
||||||
"volume:update_volume_metadata": "",
|
"volume:update_volume_metadata": "",
|
||||||
"volume:get_volume_admin_metadata": "rule:admin_api",
|
"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:update_volume_admin_metadata": "rule:admin_api",
|
||||||
"volume:get_snapshot": "",
|
"volume:get_snapshot": "",
|
||||||
"volume:get_all_snapshots": "",
|
"volume:get_all_snapshots": "",
|
||||||
|
|
Loading…
Reference in New Issue