Merge "Re-enable IPv4 scenario tests in LVM driver job"
diff --git a/manila_tempest_tests/tests/api/test_shares_actions_negative.py b/manila_tempest_tests/tests/api/test_shares_actions_negative.py
index 977d9a1..da85f2e 100644
--- a/manila_tempest_tests/tests/api/test_shares_actions_negative.py
+++ b/manila_tempest_tests/tests/api/test_shares_actions_negative.py
@@ -288,7 +288,6 @@
self.assertEqual(0, len(shares))
- @decorators.skip_because(bug='1914363')
@decorators.idempotent_id('e8f857f1-ec32-4f81-9e09-26065891dc93')
@tc.attr(base.TAG_NEGATIVE, base.TAG_API_WITH_BACKEND)
def test_get_share_from_other_project(self):
diff --git a/manila_tempest_tests/tests/rbac/test_shares.py b/manila_tempest_tests/tests/rbac/test_shares.py
index 2ca3c92..b5ea7d9 100644
--- a/manila_tempest_tests/tests/rbac/test_shares.py
+++ b/manila_tempest_tests/tests/rbac/test_shares.py
@@ -420,7 +420,7 @@
alt_share = self.create_share(
self.alt_project_share_v2_client, self.share_type['id'])
self.do_request(
- 'reset_state', expected_status=lib_exc.NotFound,
+ 'reset_state', expected_status=lib_exc.Forbidden,
s_id=alt_share['id'], status="error")
@decorators.idempotent_id('56a07567-d0a9-460a-9267-fcd82306a371')
@@ -465,7 +465,7 @@
alt_share = self.create_share(
self.alt_project_share_v2_client, self.share_type['id'])
self.do_request(
- 'set_metadata', expected_status=lib_exc.Forbidden,
+ 'set_metadata', expected_status=lib_exc.NotFound,
resource_id=alt_share['id'], metadata={'key': 'value'})
@decorators.idempotent_id('a69a2b85-3374-4621-83a9-89937ddb520b')
@@ -482,7 +482,7 @@
self.alt_project_share_v2_client, self.share_type['id'],
metadata=metadata)
self.do_request(
- 'get_metadata', expected_status=lib_exc.Forbidden,
+ 'get_metadata', expected_status=lib_exc.NotFound,
resource_id=alt_share['id'])
@decorators.idempotent_id('bea5518a-338e-494d-9034-1d03658ed58b')
@@ -498,7 +498,7 @@
self.alt_project_share_v2_client, self.share_type['id'],
metadata={'key': 'value'})
self.do_request(
- 'delete_metadata', expected_status=lib_exc.Forbidden,
+ 'delete_metadata', expected_status=lib_exc.NotFound,
resource_id=alt_share['id'], key='key')
@@ -551,7 +551,7 @@
alt_share = self.create_share(
self.alt_project_share_v2_client, self.share_type['id'])
self.do_request(
- 'delete_share', expected_status=lib_exc.NotFound,
+ 'delete_share', expected_status=lib_exc.Forbidden,
share_id=alt_share['id'])
@decorators.idempotent_id('cb040955-5897-409f-aea0-84b6ae16b77e')
@@ -596,7 +596,7 @@
self.alt_project_share_v2_client, self.share_type['id'],
size=CONF.share.share_size + 1)
self.do_request(
- 'shrink_share', expected_status=lib_exc.NotFound,
+ 'shrink_share', expected_status=lib_exc.Forbidden,
share_id=alt_share['id'], new_size=CONF.share.share_size)
@decorators.idempotent_id('0b57aedb-6b68-498f-814e-173c47e6c307')
@@ -612,7 +612,7 @@
alt_share = self.create_share(
self.alt_project_share_v2_client, self.share_type['id'])
self.do_request(
- 'extend_share', expected_status=lib_exc.NotFound,
+ 'extend_share', expected_status=lib_exc.Forbidden,
share_id=alt_share['id'], new_size=CONF.share.share_size + 1)
@decorators.idempotent_id('3def3f4e-33fc-4726-8818-6cffbc2cab51')
diff --git a/manila_tempest_tests/tests/rbac/test_snapshots.py b/manila_tempest_tests/tests/rbac/test_snapshots.py
index 810ba9b..1978415 100644
--- a/manila_tempest_tests/tests/rbac/test_snapshots.py
+++ b/manila_tempest_tests/tests/rbac/test_snapshots.py
@@ -497,7 +497,7 @@
alt_snap = self.create_snapshot(
self.alt_project_share_v2_client, self.alt_share['id'])
self.do_request(
- 'delete_snapshot', expected_status=lib_exc.NotFound,
+ 'delete_snapshot', expected_status=lib_exc.Forbidden,
snap_id=alt_snap['id'])
@decorators.idempotent_id('ed0af390-e3d0-432b-9147-c0d569181b92')
@@ -517,7 +517,7 @@
alt_snap = self.create_snapshot(
self.alt_project_share_v2_client, self.alt_share['id'])
self.do_request(
- 'rename_snapshot', expected_status=lib_exc.NotFound,
+ 'rename_snapshot', expected_status=lib_exc.Forbidden,
snapshot_id=alt_snap['id'], name=name)
@decorators.idempotent_id('b8c9c9a4-3b2a-4b1c-80d8-2ec87d708111')