openstack
/
barbican-tempest-plugin
Code Issues Proposed changes

Merge "Replace deprecated tenant_id property"

This commit is contained in:
Zuul 2024-02-09 15:52:26 +00:00 committed by Gerrit Code Review
parent 8debdcb489 00bd391ace
commit f2b9c024cb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
barbican_tempest_plugin/tests/api/test_quotas.py
View File

@ -65,7 +65,7 @@ class ProjectQuotasTest(base.BaseKeyManagerTest):
# Create a quota set for the test project
self.create_project_quota(
self.quota_client.tenant_id,
self.quota_client.project_id,
project_quotas={
'secrets': 30,
'orders': 10,
@ -79,7 +79,7 @@ class ProjectQuotasTest(base.BaseKeyManagerTest):
self.assertEqual(1, len(body.get('project_quotas')), body)
project_quotas = body.get('project_quotas')[0]
self.assertEqual(
self.quota_client.tenant_id,
self.quota_client.project_id,
project_quotas.get('project_id'),
body
)
@ -90,7 +90,7 @@ class ProjectQuotasTest(base.BaseKeyManagerTest):
# Verify that the quotas can be found via specific listing.
body = self.quota_client.get_project_quota(
self.quota_client.tenant_id
self.quota_client.project_id
)
project_quotas = body.get('project_quotas')
self.assertEqual(30, project_quotas.get('secrets'), body)
@ -98,7 +98,7 @@ class ProjectQuotasTest(base.BaseKeyManagerTest):
self.assertEqual(20, project_quotas.get('containers'), body)
# Delete the project quota and confirm that it got deleted
self.delete_project_quota(self.quota_client.tenant_id)
self.delete_project_quota(self.quota_client.project_id)
body = self.quota_client.list_quotas()
self.assertEqual(0, body.get('total'), body)

12
barbican_tempest_plugin/tests/rbac/v1/test_quotas.py
View File

@ -129,7 +129,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('948afb0d-35e8-4a23-880f-b2dc3eebf1bd')
def test_get_custom_quota_for_project(self):
project_id = self.client.tenant_id
project_id = self.client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.get_project_quota,
@ -137,7 +137,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('c29af3ed-561e-48da-8a1b-81ba19c943bb')
def test_set_new_quota_for_project(self):
project_id = self.client.tenant_id
project_id = self.client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.create_project_quota,
@ -151,7 +151,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('7382fb20-01f6-4322-9ebc-5bf6038e3e1b')
def test_remove_custom_quota_for_project(self):
project_id = self.client.tenant_id
project_id = self.client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.delete_project_quota,
@ -159,7 +159,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('5d062790-6754-4d21-bd0c-08d4a74fa6f3')
def test_get_custom_quota_for_other_project(self):
project_id = self.other_secret_client.tenant_id
project_id = self.other_secret_client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.get_project_quota,
@ -167,7 +167,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('26bd25ab-92c2-4437-a742-f301703ce523')
def test_set_new_quota_for_other_project(self):
project_id = self.other_secret_client.tenant_id
project_id = self.other_secret_client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.create_project_quota,
@ -181,7 +181,7 @@ class ProjectReaderTests(base.BarbicanV1RbacBase, BarbicanV1RbacQuota):
@decorators.idempotent_id('7a763152-c64b-42d5-9669-213681327c58')
def test_remove_custom_quota_for_other_project(self):
project_id = self.other_secret_client.tenant_id
project_id = self.other_secret_client.project_id
self.assertRaises(
exceptions.Forbidden,
self.client.delete_project_quota,