diff options
| author | Aarti Kriplani <aarti.kriplani@RACKSPACE.COM> | 2013-04-22 12:01:27 -0500 |
|---|---|---|
| committer | Aarti Kriplani <aarti.kriplani@RACKSPACE.COM> | 2013-05-23 16:25:29 +0530 |
| commit | cdd998c418edc42a6a828ddef144e8408c206b7c (patch) | |
| tree | 9f23c9005dd304e23acb32ff207bd4c526406e94 /nova/tests/integrated | |
| parent | af7048590dac77806dd3e7c97a736fda52c2389b (diff) | |
| download | nova-cdd998c418edc42a6a828ddef144e8408c206b7c.tar.gz nova-cdd998c418edc42a6a828ddef144e8408c206b7c.tar.xz nova-cdd998c418edc42a6a828ddef144e8408c206b7c.zip | |
Delete a quota through admin api.
Added 'extended-quotas' extension that has provides ability for admins
to be able to delete a non-default quota (absolute limit) for a tenant,
so that tenant's quota will revert back to the configured default.
Implements blueprint admin-api-for-delete-quota
Change-Id: I7375420a466823b3e099aebff71a8f7d7f922afb
Diffstat (limited to 'nova/tests/integrated')
3 files changed, 27 insertions, 0 deletions
diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl index d559b4890..7a636036a 100644 --- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl @@ -417,6 +417,14 @@ "updated": "%(timestamp)s" }, { + "alias": "os-extended-quotas", + "description": "%(text)s", + "links": [], + "name": "ExtendedQuotas", + "namespace": "http://docs.openstack.org/compute/ext/quota-delete/api/v1.1", + "updated": "%(timestamp)s" + }, + { "alias": "os-quota-sets", "description": "%(text)s", "links": [], diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl index cc9ae4c02..ee01eb33c 100644 --- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl @@ -156,6 +156,9 @@ <extension alias="os-quota-class-sets" updated="%(timestamp)s" namespace="http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1" name="QuotaClasses"> <description>%(text)s</description> </extension> + <extension alias="os-extended-quotas" updated="%(timestamp)s" namespace="http://docs.openstack.org/compute/ext/quota-delete/api/v1.1" name="ExtendedQuotas"> + <description>%(text)s</description> + </extension> <extension alias="os-quota-sets" updated="%(timestamp)s" namespace="http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1" name="Quotas"> <description>%(text)s</description> </extension> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 9b678ddd3..873719ab6 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -2277,6 +2277,22 @@ class QuotasSampleXmlTests(QuotasSampleJsonTests): ctype = "xml" +class ExtendedQuotasSampleJsonTests(ApiSampleTestBase): + extends_name = "nova.api.openstack.compute.contrib.quotas.Quotas" + extension_name = ("nova.api.openstack.compute.contrib" + ".extended_quotas.Extended_quotas") + + def test_delete_quotas(self): + # Get api sample to delete quota. + response = self._do_delete('os-quota-sets/fake_tenant') + self.assertEqual(response.status, 202) + self.assertEqual(response.read(), '') + + +class ExtendedQuotasSampleXmlTests(ExtendedQuotasSampleJsonTests): + ctype = "xml" + + class ExtendedIpsSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_ips.Extended_ips") |