Ensure metadata tests manipulate only its own metadata
There are some metadata that only drivers or administrators can
manipulate, and if the tests haven't created those, we should not
be adding them to our asserts.
In this change, we are making sure that tests will only validate
the metadata that they are creating.
Change-Id: I168e1d9057d48b61eb325f2fd93dcc12a406f06e
(cherry picked from commit cf874b1dacd860040e4187c831d5d636479881fa)
Related-Prod: PRODX-48368
(cherry picked from commit 60b15a8c363148442ebdc09e558f4634127cc665)
diff --git a/manila_tempest_tests/tests/api/test_metadata.py b/manila_tempest_tests/tests/api/test_metadata.py
index d2ae326..35bcf71 100644
--- a/manila_tempest_tests/tests/api/test_metadata.py
+++ b/manila_tempest_tests/tests/api/test_metadata.py
@@ -33,12 +33,6 @@
def _verify_share_metadata(self, share, md):
- # get metadata of share
- metadata = self.shares_v2_client.get_metadata(share["id"])['metadata']
-
- # verify metadata
- self.assertEqual(md, metadata)
-
# verify metadata items
for key in md:
get_value = self.shares_v2_client.get_metadata_item(share["id"],
@@ -82,7 +76,8 @@
# verify deletion of metadata
get_metadata = self.shares_v2_client.get_metadata(share["id"])[
'metadata']
- self.assertEmpty(get_metadata)
+ for key in md.keys():
+ self.assertNotIn(key, list(get_metadata.keys()))
@decorators.idempotent_id('4e5f8159-62b6-4d5c-f729-d8b1f029d7de')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -117,7 +112,8 @@
# verify deletion of metadata
get_metadata = self.shares_v2_client.get_metadata(
share["id"])['metadata']
- self.assertEmpty(get_metadata)
+ for key in md.keys():
+ self.assertNotIn(key, list(get_metadata.keys()))
@decorators.idempotent_id('2ec70ba5-050b-3b17-c862-c149e53543c0')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -150,7 +146,8 @@
# verify deletion of metadata
get_metadata = self.shares_v2_client.get_metadata(
share["id"])['metadata']
- self.assertEmpty(get_metadata)
+ for key in md.keys():
+ self.assertNotIn(key, list(get_metadata.keys()))
@decorators.idempotent_id('c94851f4-2559-4712-9297-9912db1da7ff')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -228,7 +225,7 @@
body_get = self.shares_v2_client.get_metadata(
self.share["id"])['metadata']
- self.assertEqual(data, body_get)
+ self.assertEqual(data["k"], body_get["k"])
@decorators.idempotent_id('5eff5619-b7cd-42f1-85e0-47d3d47098dd')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -240,7 +237,9 @@
body_get = self.shares_v2_client.get_metadata(
self.share["id"])['metadata']
- self.assertEqual(data, body_get)
+ body_get_keys = list(body_get.keys())
+ self.assertIn(max_key, body_get_keys)
+ self.assertEqual(data[max_key], body_get[max_key])
@decorators.idempotent_id('44a572f1-6b5c-49d0-8f2e-1583ec3428d8')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -251,7 +250,7 @@
body_get = self.shares_v2_client.get_metadata(
self.share["id"])['metadata']
- self.assertEqual(data, body_get)
+ self.assertEqual(data["key"], body_get["key"])
@decorators.idempotent_id('694d95e1-ba8c-49fc-a888-6f9f0d51d77d')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -263,4 +262,4 @@
body_get = self.shares_v2_client.get_metadata(
self.share["id"])['metadata']
- self.assertEqual(data, body_get)
+ self.assertEqual(max_value, body_get["key"])