openstack
/
heat
Code Issues Proposed changes

Use default_client_name for keystone 

Change-Id: I3e95fb7c403f46b314c78edc61e6eb14c53c3e89
This commit is contained in:
Oleksii Chuprykov 2015-07-21 14:38:35 +03:00
parent d42e4bdc42
commit b3f954b3a2
14 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/openstack/keystone/endpoint.py
View File

@ -74,7 +74,7 @@ class KeystoneEndpoint(resource.Resource):
url,
region=None,
name=None):
return self.keystone().client.endpoints.create(
return self.client().client.endpoints.create(
region=region,
service=service,
interface=interface,
@ -82,7 +82,7 @@ class KeystoneEndpoint(resource.Resource):
name=name)
def _delete_endpoint(self, endpoint_id):
return self.keystone().client.endpoints.delete(endpoint_id)
return self.client().client.endpoints.delete(endpoint_id)
def _update_endpoint(self,
endpoint_id,
@ -91,7 +91,7 @@ class KeystoneEndpoint(resource.Resource):
new_interface=None,
new_url=None,
new_name=None):
return self.keystone().client.endpoints.update(
return self.client().client.endpoints.update(
endpoint=endpoint_id,
region=new_region,
service=new_service,

8
heat/engine/resources/openstack/keystone/group.py
View File

@ -25,6 +25,8 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
version='2015.1',
message=_('Supported versions: keystone v3'))
default_client_name = 'keystone'
PROPERTIES = (
NAME, DOMAIN, DESCRIPTION
) = (
@ -61,13 +63,13 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
domain):
domain = self.client_plugin().get_domain_id(domain)
return self.keystone().client.groups.create(
return self.client().client.groups.create(
name=group_name,
domain=domain,
description=description)
def _delete_group(self, group_id):
return self.keystone().client.groups.delete(group_id)
return self.client().client.groups.delete(group_id)
def _update_group(self,
group_id,
@ -84,7 +86,7 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
values['group'] = group_id
domain = self.client_plugin().get_domain_id(domain)
values['domain_id'] = domain
return self.keystone().client.groups.update(**values)
return self.client().client.groups.update(**values)
def handle_create(self):
group_name = (self.properties.get(self.NAME) or

6
heat/engine/resources/openstack/keystone/project.py
View File

@ -67,14 +67,14 @@ class KeystoneProject(resource.Resource):
enabled):
domain = self.client_plugin().get_domain_id(domain)
return self.keystone().client.projects.create(
return self.client().client.projects.create(
name=project_name,
domain=domain,
description=description,
enabled=enabled)
def _delete_project(self, project_id):
return self.keystone().client.projects.delete(project_id)
return self.client().client.projects.delete(project_id)
def _update_project(self,
project_id,
@ -96,7 +96,7 @@ class KeystoneProject(resource.Resource):
values['domain'] = domain
return self.keystone().client.projects.update(**values)
return self.client().client.projects.update(**values)
def handle_create(self):
project_name = (self.properties.get(self.NAME) or

6
heat/engine/resources/openstack/keystone/role.py
View File

@ -41,13 +41,13 @@ class KeystoneRole(resource.Resource):
}
def _create_role(self, role_name):
return self.keystone().client.roles.create(name=role_name)
return self.client().client.roles.create(name=role_name)
def _delete_role(self, role_id):
return self.keystone().client.roles.delete(role_id)
return self.client().client.roles.delete(role_id)
def _update_role(self, role_id, new_name):
return self.keystone().client.roles.update(
return self.client().client.roles.update(
role=role_id,
name=new_name
)

16
heat/engine/resources/openstack/keystone/role_assignments.py
View File

@ -104,13 +104,13 @@ class KeystoneRoleAssignment(resource.Resource):
def _add_role_assignments_to_group(self, group_id, role_assignments):
for role_assignment in self._normalize_to_id(role_assignments):
if role_assignment.get(self.PROJECT) is not None:
self.keystone().client.roles.grant(
self.client().client.roles.grant(
role=role_assignment.get(self.ROLE),
project=role_assignment.get(self.PROJECT),
group=group_id
)
elif role_assignment.get(self.DOMAIN) is not None:
self.keystone().client.roles.grant(
self.client().client.roles.grant(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
group=group_id
@ -119,13 +119,13 @@ class KeystoneRoleAssignment(resource.Resource):
def _add_role_assignments_to_user(self, user_id, role_assignments):
for role_assignment in self._normalize_to_id(role_assignments):
if role_assignment.get(self.PROJECT) is not None:
self.keystone().client.roles.grant(
self.client().client.roles.grant(
role=role_assignment.get(self.ROLE),
project=role_assignment.get(self.PROJECT),
user=user_id
)
elif role_assignment.get(self.DOMAIN) is not None:
self.keystone().client.roles.grant(
self.client().client.roles.grant(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
user=user_id
@ -134,13 +134,13 @@ class KeystoneRoleAssignment(resource.Resource):
def _remove_role_assignments_from_group(self, group_id, role_assignments):
for role_assignment in self._normalize_to_id(role_assignments):
if role_assignment.get(self.PROJECT) is not None:
self.keystone().client.roles.revoke(
self.client().client.roles.revoke(
role=role_assignment.get(self.ROLE),
project=role_assignment.get(self.PROJECT),
group=group_id
)
elif role_assignment.get(self.DOMAIN) is not None:
self.keystone().client.roles.revoke(
self.client().client.roles.revoke(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
group=group_id
@ -149,13 +149,13 @@ class KeystoneRoleAssignment(resource.Resource):
def _remove_role_assignments_from_user(self, user_id, role_assignments):
for role_assignment in self._normalize_to_id(role_assignments):
if role_assignment.get(self.PROJECT) is not None:
self.keystone().client.roles.revoke(
self.client().client.roles.revoke(
role=role_assignment.get(self.ROLE),
project=role_assignment.get(self.PROJECT),
user=user_id
)
elif role_assignment.get(self.DOMAIN) is not None:
self.keystone().client.roles.revoke(
self.client().client.roles.revoke(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
user=user_id

6
heat/engine/resources/openstack/keystone/service.py
View File

@ -55,20 +55,20 @@ class KeystoneService(resource.Resource):
name,
type,
description=None):
return self.keystone().client.services.create(
return self.client().client.services.create(
name=name,
description=description,
type=type)
def _delete_service(self, service_id):
return self.keystone().client.services.delete(service_id)
return self.client().client.services.delete(service_id)
def _update_service(self,
service_id,
new_name=None,
new_description=None,
new_type=None):
return self.keystone().client.services.update(
return self.client().client.services.update(
service=service_id,
name=new_name,
description=new_description,

16
heat/engine/resources/openstack/keystone/user.py
View File

@ -25,6 +25,8 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
version='2015.1',
message=_('Supported versions: keystone v3'))
default_client_name = 'keystone'
PROPERTIES = (
NAME, DOMAIN, DESCRIPTION, ENABLED, EMAIL, PASSWORD,
DEFAULT_PROJECT, GROUPS
@ -102,7 +104,7 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
default_project = (self.client_plugin().
get_project_id(default_project))
return self.keystone().client.users.create(
return self.client().client.users.create(
name=user_name,
domain=domain,
description=description,
@ -112,7 +114,7 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
default_project=default_project)
def _delete_user(self, user_id):
return self.keystone().client.users.delete(user_id)
return self.client().client.users.delete(user_id)
def _update_user(self,
user_id,
@ -143,7 +145,7 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
values['domain'] = domain
return self.keystone().client.users.update(**values)
return self.client().client.users.update(**values)
def _add_user_to_groups(self, user_id, groups):
if groups is not None:
@ -151,8 +153,8 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
for group in groups]
for group_id in group_ids:
self.keystone().client.users.add_to_group(user_id,
group_id)
self.client().client.users.add_to_group(user_id,
group_id)
def _remove_user_from_groups(self, user_id, groups):
if groups is not None:
@ -160,8 +162,8 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment):
for group in groups]
for group_id in group_ids:
self.keystone().client.users.remove_from_group(user_id,
group_id)
self.client().client.users.remove_from_group(user_id,
group_id)
def _find_diff(self, updated_prps, stored_prps):
new_group_ids = [self.client_plugin().get_group_id(group)

4
heat/tests/keystone/test_endpoint.py
View File

@ -55,8 +55,8 @@ class KeystoneEndpointTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_endpoint.keystone = mock.MagicMock()
self.test_endpoint.keystone.return_value = self.keystoneclient
self.test_endpoint.client = mock.MagicMock()
self.test_endpoint.client.return_value = self.keystoneclient
self.endpoints = self.keystoneclient.client.endpoints
# Mock client plugin

4
heat/tests/keystone/test_group.py
View File

@ -53,8 +53,8 @@ class KeystoneGroupTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_group.keystone = mock.MagicMock()
self.test_group.keystone.return_value = self.keystoneclient
self.test_group.client = mock.MagicMock()
self.test_group.client.return_value = self.keystoneclient
self.groups = self.keystoneclient.client.groups
# Mock client plugin

4
heat/tests/keystone/test_project.py
View File

@ -54,8 +54,8 @@ class KeystoneProjectTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_project.keystone = mock.MagicMock()
self.test_project.keystone.return_value = self.keystoneclient
self.test_project.client = mock.MagicMock()
self.test_project.client.return_value = self.keystoneclient
self.projects = self.keystoneclient.client.projects
# Mock client plugin

4
heat/tests/keystone/test_role.py
View File

@ -48,8 +48,8 @@ class KeystoneRoleTest(common.HeatTestCase):
self.test_role = self.stack['test_role']
self.keystoneclient = mock.MagicMock()
self.test_role.keystone = mock.MagicMock()
self.test_role.keystone.return_value = self.keystoneclient
self.test_role.client = mock.MagicMock()
self.test_role.client.return_value = self.keystoneclient
self.roles = self.keystoneclient.client.roles
def _get_mock_role(self):

4
heat/tests/keystone/test_role_assignments.py
View File

@ -65,8 +65,8 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_role_assignment.keystone = mock.MagicMock()
self.test_role_assignment.keystone.return_value = self.keystoneclient
self.test_role_assignment.client = mock.MagicMock()
self.test_role_assignment.client.return_value = self.keystoneclient
self.roles = self.keystoneclient.client.roles
# Mock client plugin

4
heat/tests/keystone/test_service.py
View File

@ -52,8 +52,8 @@ class KeystoneServiceTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_service.keystone = mock.MagicMock()
self.test_service.keystone.return_value = self.keystoneclient
self.test_service.client = mock.MagicMock()
self.test_service.client.return_value = self.keystoneclient
self.services = self.keystoneclient.client.services
# Mock client plugin

4
heat/tests/keystone/test_user.py
View File

@ -57,8 +57,8 @@ class KeystoneUserTest(common.HeatTestCase):
# Mock client
self.keystoneclient = mock.MagicMock()
self.test_user.keystone = mock.MagicMock()
self.test_user.keystone.return_value = self.keystoneclient
self.test_user.client = mock.MagicMock()
self.test_user.client.return_value = self.keystoneclient
self.users = self.keystoneclient.client.users
# Mock client plugin