From: Hai-Xu Cheng <chenghxu@cn.ibm.com>
Date: Thu, 20 Aug 2015 10:08:01 +0000 (+0800)
Subject: Remove the method delete_volume_admin_metadata
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=288b48ded011ac1acf31bdf59182fda41b8f99d7;p=openstack-build%2Fcinder-build.git

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 e656d0685..e18f91cc7 100644
--- 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 c06895aed..04afd490e 100644
--- 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 5a520c528..193cc977a 100644
--- 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": "",