Skip to content

Synchronise 2024.1 with upstream #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

Synchronise 2024.1 with upstream #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion magnum/common/keystone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def create_trust(self, trustee_user):
project=trustor_project_id,
trustee_user=trustee_user,
impersonation=True,
delegation_depth=0,
allow_redelegation=False,
role_names=roles)
except Exception:
LOG.exception('Failed to create trust')
Expand Down
4 changes: 2 additions & 2 deletions magnum/tests/unit/common/test_keystone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def test_create_trust_with_all_roles(self, mock_session, mock_ks):
ks_client.create_trust(trustee_user='888888')

mock_ks.return_value.trusts.create.assert_called_once_with(
delegation_depth=0,
allow_redelegation=False,
trustor_user='123456', project='654321',
trustee_user='888888', role_names=['role1', 'role2'],
impersonation=True)
Expand All @@ -173,7 +173,7 @@ def test_create_trust_with_limit_roles(self, mock_session, mock_ks):
ks_client.create_trust(trustee_user='888888')

mock_ks.return_value.trusts.create.assert_called_once_with(
delegation_depth=0,
allow_redelegation=False,
trustor_user='123456', project='654321',
trustee_user='888888', role_names=['role3'],
impersonation=True)
Expand Down