Fix quota tests for static credentials
when running tempest tests with static set of credentials Tempest does
not create new tenants on the fly, and those pre-defined tenants may alreay
have configured quotas that are different from default project ones.
For quota tests to reliaby pass we need to store the original quotas in the
beginning of the test and update to them in the cleanUp phase instead
of deleting them (which resets them to the default ones).
Change-Id: Ia1de916a97fee81148976a5b9cb134e012af8e0c
Related-Issue: https://mirantis.jira.com/browse/PROD-24450
diff --git a/designate_tempest_plugin/tests/api/admin/test_quotas.py b/designate_tempest_plugin/tests/api/admin/test_quotas.py
index c25ad0a..1221b9f 100644
--- a/designate_tempest_plugin/tests/api/admin/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/admin/test_quotas.py
@@ -36,6 +36,12 @@
credentials = ["admin"]
+ def setUp(self):
+ super(QuotasAdminTest, self).setUp()
+ _, original_quotas = self.admin_client.show_quotas()
+ self.addCleanup(self.admin_client.update_quotas,
+ **original_quotas['quota'])
+
@classmethod
def setup_credentials(cls):
# Do not create network resources for these test.
diff --git a/designate_tempest_plugin/tests/api/v2/test_quotas.py b/designate_tempest_plugin/tests/api/v2/test_quotas.py
index b32591f..4bb7269 100644
--- a/designate_tempest_plugin/tests/api/v2/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/v2/test_quotas.py
@@ -14,6 +14,7 @@
from oslo_log import log as logging
from tempest import config
from tempest.lib import decorators
+from tempest.lib import exceptions as lib_exc
from designate_tempest_plugin.tests import base
from designate_tempest_plugin import data_utils as dns_data_utils
@@ -50,8 +51,22 @@
cls.quotas_client = cls.os_primary.quotas_client
cls.admin_client = cls.os_admin.quotas_client
+ def _store_quotas(self, project_id=None, cleanup=True):
+ """Remember current quotas and reset them after the test"""
+ params = {}
+ if project_id:
+ params['project_id'] = project_id
+ params['headers'] = {'X-Auth-All-Projects': True}
+
+ _r, original_quotas = self.admin_client.show_quotas(**params)
+ params.update(original_quotas)
+ if cleanup:
+ self.addCleanup(self.admin_client.update_quotas, **params)
+ return original_quotas
+
@decorators.idempotent_id('1dac991a-9e2e-452c-a47a-26ac37381ec5')
def test_show_quotas(self):
+ self._store_quotas()
LOG.info("Updating quotas")
quotas = dns_data_utils.rand_quotas()
_, body = self.admin_client.update_quotas(**quotas)
@@ -65,6 +80,7 @@
@decorators.idempotent_id('0448b089-5803-4ce3-8a6c-5c15ff75a2cc')
def test_delete_quotas(self):
+ self._store_quotas()
LOG.info("Deleting quotas")
_, body = self.admin_client.delete_quotas()
@@ -73,10 +89,10 @@
@decorators.idempotent_id('76d24c87-1b39-4e19-947c-c08e1380dc61')
def test_update_quotas(self):
+ self._store_quotas()
LOG.info("Updating quotas")
quotas = dns_data_utils.rand_quotas()
_, body = self.admin_client.update_quotas(**quotas)
- self.addCleanup(self.admin_client.delete_quotas)
LOG.info("Ensuring the response has all quota types")
self.assertExpected(quotas, body, [])
@@ -85,6 +101,7 @@
def test_update_quotas_other_project(self):
project_id = self.quotas_client.tenant_id
+ self._store_quotas(project_id=project_id)
LOG.info("Updating quotas for %s ", project_id)
@@ -93,7 +110,6 @@
request['project_id'] = project_id
request['headers'] = {'X-Auth-All-Projects': True}
_, body = self.admin_client.update_quotas(**request)
- self.addCleanup(self.admin_client.delete_quotas, project_id=project_id)
LOG.info("Ensuring the response has all quota types")
self.assertExpected(quotas, body, [])
@@ -105,10 +121,15 @@
@decorators.idempotent_id('21e45d30-dbc1-4173-9d6b-9b6813ef514b')
def test_reset_quotas_other_project(self):
- # Use a fake project for this
- project_id = '21e45d30-dbc1-4173-9d6b-9b6813ef514b'
+ LOG.info("Using 'alt' project id to set quotas on.")
+ project_id = self.alt_client.tenant_id
+ self._store_quotas(project_id=project_id)
- _, original_quotas = self.admin_client.show_quotas(
+ LOG.info("Resetting quotas to default for %s ", project_id)
+ self.admin_client.delete_quotas(
+ project_id=project_id,
+ headers={'X-Auth-All-Projects': True})
+ _, default_quotas = self.admin_client.show_quotas(
project_id=project_id, headers={'X-Auth-All-Projects': True})
LOG.info("Updating quotas for %s ", project_id)
@@ -118,7 +139,6 @@
request['project_id'] = project_id
request['headers'] = {'X-Auth-All-Projects': True}
_, body = self.admin_client.update_quotas(**request)
- self.addCleanup(self.admin_client.delete_quotas, project_id=project_id)
self.admin_client.delete_quotas(
project_id=project_id,
@@ -127,4 +147,28 @@
_, final_quotas = self.admin_client.show_quotas(
project_id=project_id, headers={'X-Auth-All-Projects': True})
- self.assertExpected(original_quotas, final_quotas, [])
+ self.assertExpected(default_quotas, final_quotas, [])
+
+ @decorators.idempotent_id('9b09b3e2-7e88-4569-bce3-9be2f7ac70c4')
+ def test_update_quotas_invalid_project(self):
+
+ if not CONF.dns_feature_enabled.api_v2_quotas_verify_project:
+ raise self.skipException("Project ID in quotas "
+ "is not being verified.")
+
+ project_id = 'project-that-does-not-exist'
+ original_quotas = self._store_quotas(project_id=project_id,
+ cleanup=False)
+
+ LOG.info("Updating quotas for non-existing %s ", project_id)
+
+ quotas = dns_data_utils.rand_quotas()
+ request = quotas.copy()
+ request['project_id'] = project_id
+ request['headers'] = {'X-Auth-All-Projects': True}
+ with self.assertRaisesDns(lib_exc.BadRequest, 'invalid_project', 400):
+ self.admin_client.update_quotas(**request)
+
+ _, client_body = self.quotas_client.show_quotas()
+
+ self.assertExpected(original_quotas, client_body, [])