Merge "Full response for v2 IdentityClient methods"
This commit is contained in:
commit
318b9927b4
|
@ -76,7 +76,7 @@ class RolesTestJSON(base.BaseIdentityV2AdminTest):
|
|||
self.data.setup_test_role()
|
||||
role_id = self.data.role['id']
|
||||
role_name = self.data.role['name']
|
||||
body = self.client.get_role(role_id)
|
||||
body = self.client.get_role(role_id)['role']
|
||||
self.assertEqual(role_id, body['id'])
|
||||
self.assertEqual(role_name, body['name'])
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest):
|
|||
self.data.tenants.append(tenant)
|
||||
tenants.append(tenant)
|
||||
tenant_ids = map(lambda x: x['id'], tenants)
|
||||
body = self.client.list_tenants()
|
||||
body = self.client.list_tenants()['tenants']
|
||||
found = [t for t in body if t['id'] in tenant_ids]
|
||||
self.assertEqual(len(found), len(tenants), 'Tenants not created')
|
||||
|
||||
|
@ -40,7 +40,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest):
|
|||
self.client.delete_tenant(tenant['id'])
|
||||
self.data.tenants.remove(tenant)
|
||||
|
||||
body = self.client.list_tenants()
|
||||
body = self.client.list_tenants()['tenants']
|
||||
found = [tenant for tenant in body if tenant['id'] in tenant_ids]
|
||||
self.assertFalse(any(found), 'Tenants failed to delete')
|
||||
|
||||
|
|
|
@ -48,6 +48,10 @@ class BaseIdentityTest(tempest.test.BaseTestCase):
|
|||
def get_tenant_by_name(cls, name):
|
||||
try:
|
||||
tenants = cls.client.list_tenants()
|
||||
# TODO(jswarren): always retrieve 'tenants' value
|
||||
# once both clients return full response objects
|
||||
if 'tenants' in tenants:
|
||||
tenants = tenants['tenants']
|
||||
except AttributeError:
|
||||
tenants = cls.client.list_projects()['projects']
|
||||
tenant = [t for t in tenants if t['name'] == name]
|
||||
|
|
|
@ -160,7 +160,7 @@ def create_resources(opts, resources):
|
|||
raise exceptions.TempestException(
|
||||
"Role: %s - doesn't exist" % r
|
||||
)
|
||||
existing = [x['name'] for x in identity_admin.list_tenants()]
|
||||
existing = [x['name'] for x in identity_admin.list_tenants()['tenants']]
|
||||
for tenant in resources['tenants']:
|
||||
if tenant not in existing:
|
||||
identity_admin.create_tenant(tenant)
|
||||
|
|
|
@ -889,7 +889,7 @@ class TenantService(IdentityService):
|
|||
|
||||
def list(self):
|
||||
client = self.client
|
||||
tenants = client.list_tenants()
|
||||
tenants = client.list_tenants()['tenants']
|
||||
if not self.is_save_state:
|
||||
tenants = [tenant for tenant in tenants if (tenant['id']
|
||||
not in self.saved_state_json['tenants'].keys()
|
||||
|
|
|
@ -274,7 +274,7 @@ def create_tenants(tenants):
|
|||
Don't create the tenants if they already exist.
|
||||
"""
|
||||
admin = keystone_admin()
|
||||
body = admin.identity.list_tenants()
|
||||
body = admin.identity.list_tenants()['tenants']
|
||||
existing = [x['name'] for x in body]
|
||||
for tenant in tenants:
|
||||
if tenant not in existing:
|
||||
|
|
|
@ -56,7 +56,7 @@ class IdentityClient(service_client.ServiceClient):
|
|||
resp, body = self.get('OS-KSADM/roles/%s' % role_id)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return service_client.ResponseBody(resp, body['role'])
|
||||
return service_client.ResponseBody(resp, body)
|
||||
|
||||
def create_tenant(self, name, **kwargs):
|
||||
"""
|
||||
|
@ -125,10 +125,10 @@ class IdentityClient(service_client.ServiceClient):
|
|||
resp, body = self.get('tenants')
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return service_client.ResponseBodyList(resp, body['tenants'])
|
||||
return service_client.ResponseBody(resp, body)
|
||||
|
||||
def get_tenant_by_name(self, tenant_name):
|
||||
tenants = self.list_tenants()
|
||||
tenants = self.list_tenants()['tenants']
|
||||
for tenant in tenants:
|
||||
if tenant['name'] == tenant_name:
|
||||
return tenant
|
||||
|
|
|
@ -72,7 +72,7 @@ def cleanup():
|
|||
if user['name'].startswith("stress_user"):
|
||||
admin_manager.identity_client.delete_user(user['id'])
|
||||
|
||||
tenants = admin_manager.identity_client.list_tenants()
|
||||
tenants = admin_manager.identity_client.list_tenants()['tenants']
|
||||
LOG.info("Cleanup::remove %s tenants" % len(tenants))
|
||||
for tenant in tenants:
|
||||
if tenant['name'].startswith("stress_tenant"):
|
||||
|
|
|
@ -85,7 +85,7 @@ class JavelinUnitTest(base.TestCase):
|
|||
class TestCreateResources(JavelinUnitTest):
|
||||
def test_create_tenants(self):
|
||||
|
||||
self.fake_client.identity.list_tenants.return_value = []
|
||||
self.fake_client.identity.list_tenants.return_value = {'tenants': []}
|
||||
self.useFixture(mockpatch.PatchObject(javelin, "keystone_admin",
|
||||
return_value=self.fake_client))
|
||||
|
||||
|
@ -95,8 +95,8 @@ class TestCreateResources(JavelinUnitTest):
|
|||
mocked_function.assert_called_once_with(self.fake_object['name'])
|
||||
|
||||
def test_create_duplicate_tenant(self):
|
||||
self.fake_client.identity.list_tenants.return_value = [
|
||||
{'name': self.fake_object['name']}]
|
||||
self.fake_client.identity.list_tenants.return_value = {'tenants': [
|
||||
{'name': self.fake_object['name']}]}
|
||||
self.useFixture(mockpatch.PatchObject(javelin, "keystone_admin",
|
||||
return_value=self.fake_client))
|
||||
|
||||
|
|
Loading…
Reference in New Issue