commit 9792c16643b3df1f8caba3bacfa459ea4c45864c
author Felipe Monteiro <felipe.monteiro@att.com> Mon Nov 27 18:47:56 2017 +0000
committer Felipe Monteiro <felipe.monteiro@att.com> Mon Nov 27 18:55:42 2017 +0000
tree 022cd5356aef5af03ec576f4379759a08bcc9a5d
parent 05dbcfa3441aa718dc84b45bdf9041468f20647d

Correct policy names for volume metadata tests

This PS accomplishes 2 things:

1) Correct policy name for volume metadata tests that have the
wrong name. They are:
  * "volume:update_volume_metadata" ->
    "volume_extension:volume_image_metadata" [0]
  * "volume:delete_volume_metadata" ->
    "volume_extension:volume_image_metadata" [0]
2) Group together both the "volume_extension:volume_image_metadata"
   policy tests for easier readability/maintenance.\
3) Add cleanups to both tests.

[0] https://github.com/openstack/cinder/blob/0ac4af182fdd55d4a97ce283070f7b8e6480540f/cinder/policies/volume_metadata.py#L98
[1] https://github.com/openstack/cinder/blob/0ac4af182fdd55d4a97ce283070f7b8e6480540f/cinder/policies/volume_metadata.py#L106

Change-Id: Ie110283eca9decc37741b6197d0eb3f11d8918e9

patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py

diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
index 671ac19..5866934 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 
 from patrole_tempest_plugin import rbac_rule_validation
@@ -66,17 +67,6 @@
         self.volumes_client.delete_volume_metadata_item(self.volume['id'],
                                                         "key1")
 
-    @decorators.idempotent_id('a41c8eed-2051-4a25-b401-df036faacbdc')
-    @rbac_rule_validation.action(
-        service="cinder",
-        rule="volume:delete_volume_metadata")
-    def test_delete_volume_image_metadata(self):
-        self.volumes_client.update_volume_image_metadata(
-            self.volume['id'], image_id=self.image_id)
-        self.rbac_utils.switch_role(self, toggle_rbac_role=True)
-        self.volumes_client.delete_volume_image_metadata(self.volume['id'],
-                                                         'image_id')
-
     @rbac_rule_validation.action(service="cinder",
                                  rule="volume:update_volume_metadata")
     @decorators.idempotent_id('8ce2ff80-99ba-49ae-9bb1-7e96729ee5af')
@@ -98,8 +88,25 @@
     @decorators.idempotent_id('a9d9e825-5ea3-42e6-96f3-7ac4e97b2ed0')
     @rbac_rule_validation.action(
         service="cinder",
-        rule="volume:update_volume_metadata")
+        rule="volume_extension:volume_image_metadata")
     def test_update_volume_image_metadata(self):
         self.rbac_utils.switch_role(self, toggle_rbac_role=True)
         self.volumes_client.update_volume_image_metadata(
             self.volume['id'], image_id=self.image_id)
+        self.addCleanup(self.volumes_client.delete_volume_image_metadata,
+                        self.volume['id'], 'image_id')
+
+    @decorators.idempotent_id('a41c8eed-2051-4a25-b401-df036faacbdc')
+    @rbac_rule_validation.action(
+        service="cinder",
+        rule="volume_extension:volume_image_metadata")
+    def test_delete_volume_image_metadata(self):
+        self.volumes_client.update_volume_image_metadata(
+            self.volume['id'], image_id=self.image_id)
+        self.addCleanup(test_utils.call_and_ignore_notfound_exc,
+                        self.volumes_client.delete_volume_image_metadata,
+                        self.volume['id'], 'image_id')
+
+        self.rbac_utils.switch_role(self, toggle_rbac_role=True)
+        self.volumes_client.delete_volume_image_metadata(self.volume['id'],
+                                                         'image_id')