Skip to content

Commit 994e326

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Fixes inherited role assignments CRUD calls"
2 parents 35833c9 + 4097ec1 commit 994e326

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎openstackclient/identity/v3/role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def _process_identity_and_resource_options(parsed_args,
103103
parsed_args.project,
104104
parsed_args.group_domain,
105105
).id
106-
kwargs['inherited'] = parsed_args.inherited
106+
kwargs['os_inherit_extension_inherited'] = parsed_args.inherited
107107
return kwargs
108108

109109

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def test_role_add_user_domain(self):
123123
kwargs = {
124124
'user': identity_fakes.user_id,
125125
'domain': identity_fakes.domain_id,
126-
'inherited': self._is_inheritance_testcase(),
126+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
127127
}
128128
# RoleManager.grant(role, user=, group=, domain=, project=)
129129
self.roles_mock.grant.assert_called_with(
@@ -156,7 +156,7 @@ def test_role_add_user_project(self):
156156
kwargs = {
157157
'user': identity_fakes.user_id,
158158
'project': identity_fakes.project_id,
159-
'inherited': self._is_inheritance_testcase(),
159+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
160160
}
161161
# RoleManager.grant(role, user=, group=, domain=, project=)
162162
self.roles_mock.grant.assert_called_with(
@@ -189,7 +189,7 @@ def test_role_add_group_domain(self):
189189
kwargs = {
190190
'group': identity_fakes.group_id,
191191
'domain': identity_fakes.domain_id,
192-
'inherited': self._is_inheritance_testcase(),
192+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
193193
}
194194
# RoleManager.grant(role, user=, group=, domain=, project=)
195195
self.roles_mock.grant.assert_called_with(
@@ -222,7 +222,7 @@ def test_role_add_group_project(self):
222222
kwargs = {
223223
'group': identity_fakes.group_id,
224224
'project': identity_fakes.project_id,
225-
'inherited': self._is_inheritance_testcase(),
225+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
226226
}
227227
# RoleManager.grant(role, user=, group=, domain=, project=)
228228
self.roles_mock.grant.assert_called_with(
@@ -598,7 +598,7 @@ def test_role_remove_user_domain(self):
598598
kwargs = {
599599
'user': identity_fakes.user_id,
600600
'domain': identity_fakes.domain_id,
601-
'inherited': self._is_inheritance_testcase(),
601+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
602602
}
603603
# RoleManager.revoke(role, user=, group=, domain=, project=)
604604
self.roles_mock.revoke.assert_called_with(
@@ -631,7 +631,7 @@ def test_role_remove_user_project(self):
631631
kwargs = {
632632
'user': identity_fakes.user_id,
633633
'project': identity_fakes.project_id,
634-
'inherited': self._is_inheritance_testcase(),
634+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
635635
}
636636
# RoleManager.revoke(role, user=, group=, domain=, project=)
637637
self.roles_mock.revoke.assert_called_with(
@@ -665,7 +665,7 @@ def test_role_remove_group_domain(self):
665665
kwargs = {
666666
'group': identity_fakes.group_id,
667667
'domain': identity_fakes.domain_id,
668-
'inherited': self._is_inheritance_testcase(),
668+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
669669
}
670670
# RoleManager.revoke(role, user=, group=, domain=, project=)
671671
self.roles_mock.revoke.assert_called_with(
@@ -698,7 +698,7 @@ def test_role_remove_group_project(self):
698698
kwargs = {
699699
'group': identity_fakes.group_id,
700700
'project': identity_fakes.project_id,
701-
'inherited': self._is_inheritance_testcase(),
701+
'os_inherit_extension_inherited': self._is_inheritance_testcase(),
702702
}
703703
# RoleManager.revoke(role, user=, group=, domain=, project=)
704704
self.roles_mock.revoke.assert_called_with(

0 commit comments

Comments
 (0)