openstack
/
heat
Code Issues Proposed changes

Fix mixin class clients 

In patch I78b57d44b37c34cebadc2b72cf55b4f9405447a3
was added new clients methods for keystone resources.
As result it leads to error when we try to use role_assignments
properties.

Change-Id: I127863ee37f2cba487d6c66ec12a0035319f3fc2
Closes-Bug: #1509333
This commit is contained in:
Sergey Kraynev 2015-10-22 10:10:13 -04:00
parent 9755629750
commit 6621d64da7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,13 +96,13 @@ class KeystoneRoleAssignmentMixin(object):
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.client().client.roles.grant(
self.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.client().client.roles.grant(
self.client().roles.grant(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
group=group_id
@ -111,13 +111,13 @@ class KeystoneRoleAssignmentMixin(object):
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.client().client.roles.grant(
self.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.client().client.roles.grant(
self.client().roles.grant(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
user=user_id
@ -126,13 +126,13 @@ class KeystoneRoleAssignmentMixin(object):
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.client().client.roles.revoke(
self.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.client().client.roles.revoke(
self.client().roles.revoke(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
group=group_id
@ -141,13 +141,13 @@ class KeystoneRoleAssignmentMixin(object):
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.client().client.roles.revoke(
self.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.client().client.roles.revoke(
self.client().roles.revoke(
role=role_assignment.get(self.ROLE),
domain=role_assignment.get(self.DOMAIN),
user=user_id

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

@ -78,7 +78,7 @@ class KeystoneRoleAssignmentMixinTest(common.HeatTestCase):
self.keystoneclient = mock.MagicMock()
self.test_role_assignment.client = mock.MagicMock()
self.test_role_assignment.client.return_value = self.keystoneclient
self.roles = self.keystoneclient.client.roles
self.roles = self.keystoneclient.roles
# Mock client plugin
def _side_effect(value):
@ -412,7 +412,7 @@ class KeystoneUserRoleAssignmentTest(common.HeatTestCase):
self.keystoneclient = mock.MagicMock()
self.test_role_assignment.client = mock.MagicMock()
self.test_role_assignment.client.return_value = self.keystoneclient
self.roles = self.keystoneclient.client.roles
self.roles = self.keystoneclient.roles
# Mock client plugin
def _side_effect(value):
@ -550,7 +550,7 @@ class KeystoneGroupRoleAssignmentTest(common.HeatTestCase):
self.keystoneclient = mock.MagicMock()
self.test_role_assignment.client = mock.MagicMock()
self.test_role_assignment.client.return_value = self.keystoneclient
self.roles = self.keystoneclient.client.roles
self.roles = self.keystoneclient.roles
# Mock client plugin
def _side_effect(value):