openstack
/
tempest
Code Issues Proposed changes

Merge "Remove the wapper method show_quota_usage()"

This commit is contained in:
Jenkins 2016-08-02 04:52:55 +00:00 committed by Gerrit Code Review
parent 10d423a263 3cf9eaff82
commit 554cc8a3b3
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tempest/api/volume/admin/test_volume_quotas.py
View File

@ -73,8 +73,9 @@ class BaseVolumeQuotasAdminV2TestJSON(base.BaseVolumeAdminTest):
@test.idempotent_id('18c51ae9-cb03-48fc-b234-14a19374dbed') @test.idempotent_id('18c51ae9-cb03-48fc-b234-14a19374dbed')
def test_show_quota_usage(self): def test_show_quota_usage(self):
quota_usage = self.admin_quotas_client.show_quota_usage( quota_usage = self.admin_quotas_client.show_quota_set(
self.os_adm.credentials.tenant_id)['quota_set'] self.os_adm.credentials.tenant_id,
params={'usage': True})['quota_set']
for key in QUOTA_KEYS: for key in QUOTA_KEYS:
self.assertIn(key, quota_usage) self.assertIn(key, quota_usage)
for usage_key in QUOTA_USAGE_KEYS: for usage_key in QUOTA_USAGE_KEYS:
@ -82,15 +83,15 @@ class BaseVolumeQuotasAdminV2TestJSON(base.BaseVolumeAdminTest):
@test.idempotent_id('ae8b6091-48ad-4bfa-a188-bbf5cc02115f') @test.idempotent_id('ae8b6091-48ad-4bfa-a188-bbf5cc02115f')
def test_quota_usage(self): def test_quota_usage(self):
quota_usage = self.admin_quotas_client.show_quota_usage( quota_usage = self.admin_quotas_client.show_quota_set(
self.demo_tenant_id)['quota_set'] self.demo_tenant_id, params={'usage': True})['quota_set']
volume = self.create_volume() volume = self.create_volume()
self.addCleanup(self.delete_volume, self.addCleanup(self.delete_volume,
self.admin_volume_client, volume['id']) self.admin_volume_client, volume['id'])
new_quota_usage = self.admin_quotas_client.show_quota_usage( new_quota_usage = self.admin_quotas_client.show_quota_set(
self.demo_tenant_id)['quota_set'] self.demo_tenant_id, params={'usage': True})['quota_set']
self.assertEqual(quota_usage['volumes']['in_use'] + 1, self.assertEqual(quota_usage['volumes']['in_use'] + 1,
new_quota_usage['volumes']['in_use']) new_quota_usage['volumes']['in_use'])
@ -128,11 +129,11 @@ class BaseVolumeQuotasAdminV2TestJSON(base.BaseVolumeAdminTest):
self.admin_volume_client, volume['id']) self.admin_volume_client, volume['id'])
# List of tenants quota usage pre-transfer # List of tenants quota usage pre-transfer
primary_quota = self.admin_quotas_client.show_quota_usage( primary_quota = self.admin_quotas_client.show_quota_set(
self.demo_tenant_id)['quota_set'] self.demo_tenant_id, params={'usage': True})['quota_set']
alt_quota = self.admin_quotas_client.show_quota_usage( alt_quota = self.admin_quotas_client.show_quota_set(
self.alt_client.tenant_id)['quota_set'] self.alt_client.tenant_id, params={'usage': True})['quota_set']
# Creates a volume transfer # Creates a volume transfer
transfer = self.volumes_client.create_volume_transfer( transfer = self.volumes_client.create_volume_transfer(
@ -149,11 +150,11 @@ class BaseVolumeQuotasAdminV2TestJSON(base.BaseVolumeAdminTest):
self.alt_client, volume['id'], 'available') self.alt_client, volume['id'], 'available')
# List of tenants quota usage post transfer # List of tenants quota usage post transfer
new_primary_quota = self.admin_quotas_client.show_quota_usage( new_primary_quota = self.admin_quotas_client.show_quota_set(
self.demo_tenant_id)['quota_set'] self.demo_tenant_id, params={'usage': True})['quota_set']
new_alt_quota = self.admin_quotas_client.show_quota_usage( new_alt_quota = self.admin_quotas_client.show_quota_set(
self.alt_client.tenant_id)['quota_set'] self.alt_client.tenant_id, params={'usage': True})['quota_set']
# Verify tenants quota usage was updated # Verify tenants quota usage was updated
self.assertEqual(primary_quota['volumes']['in_use'] - self.assertEqual(primary_quota['volumes']['in_use'] -

3
tempest/cmd/cleanup_service.py
View File

@ -349,7 +349,8 @@ class VolumeQuotaService(BaseService):
LOG.exception("Delete Volume Quotas exception.") LOG.exception("Delete Volume Quotas exception.")
def dry_run(self): def dry_run(self):
quotas = self.client.show_quota_usage(self.tenant_id)['quota_set'] quotas = self.client.show_quota_set(
self.tenant_id, params={'usage': True})['quota_set']
self.data['volume_quotas'] = quotas self.data['volume_quotas'] = quotas

6
tempest/services/volume/base/admin/base_quotas_client.py
View File

@ -42,12 +42,6 @@ class BaseQuotasClient(rest_client.RestClient):
body = jsonutils.loads(body) body = jsonutils.loads(body)
return rest_client.ResponseBody(resp, body) return rest_client.ResponseBody(resp, body)
def show_quota_usage(self, tenant_id):
"""List the quota set for a tenant."""
body = self.show_quota_set(tenant_id, params={'usage': True})
return body
def update_quota_set(self, tenant_id, **kwargs): def update_quota_set(self, tenant_id, **kwargs):
"""Updates quota set """Updates quota set