Remove the method delete_volume_admin_metadata

This method is no longer used. This patch proposes
to delete it and some related policies.

Closes-Bug: #1485435
Change-Id: I78f4f545f4a9f2088269925b48db123b901c4f96

diff --git a/cinder/tests/unit/policy.json b/cinder/tests/unit/policy.json
index e656d06859f4958991787e91db4186c0aae9b4e6..e18f91cc785e0154023c7b73826044ff4876ed1e 100644 (file)
--- a/cinder/tests/unit/policy.json
+++ b/cinder/tests/unit/policy.json
@@ -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": "",

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index c06895aed8298dc6b41d707c56db716767f45af5..04afd490e727868c45097c8fe6284428e26f8f1c 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -1025,13 +1025,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):

diff --git a/etc/cinder/policy.json b/etc/cinder/policy.json
index 5a520c528bde37dc5c0c91cd4e0ee098eea54b12..193cc977a594cf21a0919fc76ca5d50169dcafec 100644 (file)
--- a/etc/cinder/policy.json
+++ b/etc/cinder/policy.json
@@ -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": "",