openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fixes inherited role assignments CRUD calls"

Browse Source
This commit is contained in:
Jenkins 2015-08-07 06:12:29 +00:00 committed by Gerrit Code Review
commit 994e326c79
2 changed files with 9 additions and 9 deletions
openstackclient
identity/v3
role.py
tests/identity/v3
test_role.py

2
openstackclient/identity/v3/role.py

@ -103,7 +103,7 @@ def _process_identity_and_resource_options(parsed_args,
parsed_args.project, parsed_args.project,
parsed_args.group_domain, parsed_args.group_domain,
).id ).id
kwargs['inherited'] = parsed_args.inherited kwargs['os_inherit_extension_inherited'] = parsed_args.inherited
return kwargs return kwargs

16
openstackclient/tests/identity/v3/test_role.py

@ -123,7 +123,7 @@ class TestRoleAdd(TestRole):
kwargs = { kwargs = {
'user': identity_fakes.user_id, 'user': identity_fakes.user_id,
'domain': identity_fakes.domain_id, 'domain': identity_fakes.domain_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.grant(role, user=, group=, domain=, project=) # RoleManager.grant(role, user=, group=, domain=, project=)
self.roles_mock.grant.assert_called_with( self.roles_mock.grant.assert_called_with(
@ -156,7 +156,7 @@ class TestRoleAdd(TestRole):
kwargs = { kwargs = {
'user': identity_fakes.user_id, 'user': identity_fakes.user_id,
'project': identity_fakes.project_id, 'project': identity_fakes.project_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.grant(role, user=, group=, domain=, project=) # RoleManager.grant(role, user=, group=, domain=, project=)
self.roles_mock.grant.assert_called_with( self.roles_mock.grant.assert_called_with(
@ -189,7 +189,7 @@ class TestRoleAdd(TestRole):
kwargs = { kwargs = {
'group': identity_fakes.group_id, 'group': identity_fakes.group_id,
'domain': identity_fakes.domain_id, 'domain': identity_fakes.domain_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.grant(role, user=, group=, domain=, project=) # RoleManager.grant(role, user=, group=, domain=, project=)
self.roles_mock.grant.assert_called_with( self.roles_mock.grant.assert_called_with(
@ -222,7 +222,7 @@ class TestRoleAdd(TestRole):
kwargs = { kwargs = {
'group': identity_fakes.group_id, 'group': identity_fakes.group_id,
'project': identity_fakes.project_id, 'project': identity_fakes.project_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.grant(role, user=, group=, domain=, project=) # RoleManager.grant(role, user=, group=, domain=, project=)
self.roles_mock.grant.assert_called_with( self.roles_mock.grant.assert_called_with(
@ -598,7 +598,7 @@ class TestRoleRemove(TestRole):
kwargs = { kwargs = {
'user': identity_fakes.user_id, 'user': identity_fakes.user_id,
'domain': identity_fakes.domain_id, 'domain': identity_fakes.domain_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.revoke(role, user=, group=, domain=, project=) # RoleManager.revoke(role, user=, group=, domain=, project=)
self.roles_mock.revoke.assert_called_with( self.roles_mock.revoke.assert_called_with(
@ -631,7 +631,7 @@ class TestRoleRemove(TestRole):
kwargs = { kwargs = {
'user': identity_fakes.user_id, 'user': identity_fakes.user_id,
'project': identity_fakes.project_id, 'project': identity_fakes.project_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.revoke(role, user=, group=, domain=, project=) # RoleManager.revoke(role, user=, group=, domain=, project=)
self.roles_mock.revoke.assert_called_with( self.roles_mock.revoke.assert_called_with(
@ -665,7 +665,7 @@ class TestRoleRemove(TestRole):
kwargs = { kwargs = {
'group': identity_fakes.group_id, 'group': identity_fakes.group_id,
'domain': identity_fakes.domain_id, 'domain': identity_fakes.domain_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.revoke(role, user=, group=, domain=, project=) # RoleManager.revoke(role, user=, group=, domain=, project=)
self.roles_mock.revoke.assert_called_with( self.roles_mock.revoke.assert_called_with(
@ -698,7 +698,7 @@ class TestRoleRemove(TestRole):
kwargs = { kwargs = {
'group': identity_fakes.group_id, 'group': identity_fakes.group_id,
'project': identity_fakes.project_id, 'project': identity_fakes.project_id,
'inherited': self._is_inheritance_testcase(), 'os_inherit_extension_inherited': self._is_inheritance_testcase(),
} }
# RoleManager.revoke(role, user=, group=, domain=, project=) # RoleManager.revoke(role, user=, group=, domain=, project=)
self.roles_mock.revoke.assert_called_with( self.roles_mock.revoke.assert_called_with(