openstack/deb-tempest
Code Issues Proposed changes

Merge "Return complete response from tenant_usages_client"

Browse Source
This commit is contained in:
Jenkins
2015-08-25 18:11:43 +00:00
committed by Gerrit Code Review
parent 5aa018f707 d8c36a576b
commit 5363d75c97
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/compute/admin/test_simple_tenant_usage.py
View File

@@ -50,14 +50,14 @@ class TenantUsagesTestJSON(base.BaseV2ComputeAdminTest):
def test_list_usage_all_tenants(self):
# Get usage for all tenants
tenant_usage = self.adm_client.list_tenant_usages(
start=self.start, end=self.end, detailed="1")
start=self.start, end=self.end, detailed="1")['tenant_usages'][0]
self.assertEqual(len(tenant_usage), 8)
@test.idempotent_id('94135049-a4c5-4934-ad39-08fa7da4f22e')
def test_get_usage_tenant(self):
# Get usage for a specific tenant
tenant_usage = self.adm_client.show_tenant_usage(
self.tenant_id, start=self.start, end=self.end)
self.tenant_id, start=self.start, end=self.end)['tenant_usage']
self.assertEqual(len(tenant_usage), 8)
@@ -65,6 +65,6 @@ class TenantUsagesTestJSON(base.BaseV2ComputeAdminTest):
def test_get_usage_tenant_with_non_admin_user(self):
# Get usage for a specific tenant with non admin user
tenant_usage = self.client.show_tenant_usage(
self.tenant_id, start=self.start, end=self.end)
self.tenant_id, start=self.start, end=self.end)['tenant_usage']
self.assertEqual(len(tenant_usage), 8)

4
tempest/services/compute/json/tenant_usages_client.py
View File

@@ -30,7 +30,7 @@ class TenantUsagesClient(service_client.ServiceClient):
resp, body = self.get(url)
body = json.loads(body)
self.validate_response(schema.list_tenant_usage, resp, body)
return service_client.ResponseBodyList(resp, body['tenant_usages'][0])
return service_client.ResponseBody(resp, body)
def show_tenant_usage(self, tenant_id, **params):
url = 'os-simple-tenant-usage/%s' % tenant_id
@@ -40,4 +40,4 @@ class TenantUsagesClient(service_client.ServiceClient):
resp, body = self.get(url)
body = json.loads(body)
self.validate_response(schema.get_tenant_usage, resp, body)
return service_client.ResponseBodyList(resp, body['tenant_usage'])
return service_client.ResponseBody(resp, body)