openstack
/
keystone
Code Issues Proposed changes

Remove parent_id in v2 tenant response 

Identity v2 api should be not be aware of hierarchical projects,
so the parent_id should not be included in the tenant response.

Change-Id: Ic77ab94c9fb790c04e6ee2b464308f07a6e9dba8
Closes-Bug: #1423022
This commit is contained in:
lin-hua-cheng 2015-03-13 15:51:33 -07:00 committed by Brant Knudson
parent 253c13f9f0
commit 74f83a4c8b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystone/resource/controllers.py
View File

@ -48,7 +48,7 @@ class Tenant(controller.V2Controller):
tenant_refs = self.resource_api.list_projects_in_domain(
CONF.identity.default_domain_id)
for tenant_ref in tenant_refs:
tenant_ref = self.filter_domain_id(tenant_ref)
tenant_ref = self.v3_to_v2_project(tenant_ref)
params = {
'limit': context['query_string'].get('limit'),
'marker': context['query_string'].get('marker'),
@ -60,14 +60,14 @@ class Tenant(controller.V2Controller):
# TODO(termie): this stuff should probably be moved to middleware
self.assert_admin(context)
ref = self.resource_api.get_project(tenant_id)
return {'tenant': self.filter_domain_id(ref)}
return {'tenant': self.v3_to_v2_project(ref)}
@controller.v2_deprecated
def get_project_by_name(self, context, tenant_name):
self.assert_admin(context)
ref = self.resource_api.get_project_by_name(
tenant_name, CONF.identity.default_domain_id)
return {'tenant': self.filter_domain_id(ref)}
return {'tenant': self.v3_to_v2_project(ref)}
# CRUD Extension
@controller.v2_deprecated
@ -83,7 +83,7 @@ class Tenant(controller.V2Controller):
tenant = self.resource_api.create_project(
tenant_ref['id'],
self._normalize_domain_id(context, tenant_ref))
return {'tenant': self.filter_domain_id(tenant)}
return {'tenant': self.v3_to_v2_project(tenant)}
@controller.v2_deprecated
def update_project(self, context, tenant_id, tenant):
@ -95,7 +95,7 @@ class Tenant(controller.V2Controller):
tenant_ref = self.resource_api.update_project(
tenant_id, clean_tenant)
return {'tenant': tenant_ref}
return {'tenant': self.v3_to_v2_project(tenant_ref)}
@controller.v2_deprecated
def delete_project(self, context, tenant_id):

2
keystone/tests/unit/test_v2.py
View File

@ -56,6 +56,8 @@ class CoreApiTests(object):
def assertValidTenant(self, tenant):
self.assertIsNotNone(tenant.get('id'))
self.assertIsNotNone(tenant.get('name'))
self.assertNotIn('domain_id', tenant)
self.assertNotIn('parent_id', tenant)
def assertValidUser(self, user):
self.assertIsNotNone(user.get('id'))

1
keystone/tests/unit/test_v2_controller.py
View File

@ -92,4 +92,5 @@ class TenantTestCase(tests.TestCase):
for tenant in default_fixtures.TENANTS:
tenant_copy = tenant.copy()
tenant_copy.pop('domain_id')
tenant_copy.pop('parent_id')
self.assertIn(tenant_copy, refs['tenants'])