openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix ignored --user-domain in role assignment list"

Browse Source
This commit is contained in:
Zuul
2024-11-05 17:01:54 +00:00
committed by Gerrit Code Review
parent db115c09a2 2e491191e5
commit 974cdd9a4e
3 changed files with 284 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
openstackclient/identity/common.py
View File

@@ -184,13 +184,6 @@ def _get_token_resource(client, resource, parsed_name, parsed_domain=None):
return parsed_name return parsed_name
def _get_domain_id_if_requested(identity_client, domain_name_or_id):
if not domain_name_or_id:
return None
domain = find_domain(identity_client, domain_name_or_id)
return domain.id
def find_domain(identity_client, name_or_id): def find_domain(identity_client, name_or_id):
return _find_identity_resource( return _find_identity_resource(
identity_client.domains, name_or_id, domains.Domain identity_client.domains, name_or_id, domains.Domain
@@ -198,13 +191,12 @@ def find_domain(identity_client, name_or_id):
def find_group(identity_client, name_or_id, domain_name_or_id=None): def find_group(identity_client, name_or_id, domain_name_or_id=None):
domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if domain_name_or_id is None:
if not domain_id:
return _find_identity_resource( return _find_identity_resource(
identity_client.groups, name_or_id, groups.Group identity_client.groups, name_or_id, groups.Group
) )
else:
domain_id = find_domain(identity_client, domain_id).id domain_id = find_domain(identity_client, domain_name_or_id).id
return _find_identity_resource( return _find_identity_resource(
identity_client.groups, identity_client.groups,
name_or_id, name_or_id,
@@ -214,13 +206,11 @@ def find_group(identity_client, name_or_id, domain_name_or_id=None):
def find_project(identity_client, name_or_id, domain_name_or_id=None): def find_project(identity_client, name_or_id, domain_name_or_id=None):
domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if domain_name_or_id is None:
if not domain_id:
return _find_identity_resource( return _find_identity_resource(
identity_client.projects, name_or_id, projects.Project identity_client.projects, name_or_id, projects.Project
) )
else: domain_id = find_domain(identity_client, domain_name_or_id).id
domain_id = find_domain(identity_client, domain_id).id
return _find_identity_resource( return _find_identity_resource(
identity_client.projects, identity_client.projects,
name_or_id, name_or_id,
@@ -230,13 +220,11 @@ def find_project(identity_client, name_or_id, domain_name_or_id=None):
def find_user(identity_client, name_or_id, domain_name_or_id=None): def find_user(identity_client, name_or_id, domain_name_or_id=None):
domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if domain_name_or_id is None:
if not domain_id:
return _find_identity_resource( return _find_identity_resource(
identity_client.users, name_or_id, users.User identity_client.users, name_or_id, users.User
) )
else: domain_id = find_domain(identity_client, domain_name_or_id).id
domain_id = find_domain(identity_client, domain_id).id
return _find_identity_resource( return _find_identity_resource(
identity_client.users, name_or_id, users.User, domain_id=domain_id identity_client.users, name_or_id, users.User, domain_id=domain_id
) )

2
openstackclient/identity/v3/role_assignment.py
View File

@@ -148,7 +148,7 @@ class ListRoleAssignment(command.Lister):
user_domain_id = None user_domain_id = None
if parsed_args.user_domain: if parsed_args.user_domain:
project_domain_id = _find_sdk_id( user_domain_id = _find_sdk_id(
identity_client.find_domain, identity_client.find_domain,
name_or_id=parsed_args.user_domain, name_or_id=parsed_args.user_domain,
) )

261
openstackclient/tests/unit/identity/v3/test_role_assignment.py
View File

@@ -165,7 +165,75 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--user', self.user.name] arglist = ['--user', self.user.name]
verifylist = [ verifylist = [
('user', self.user.name), ('user', self.user.name),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None),
('domain', None),
('project', None),
('project_domain', None),
('role', None),
('effective', None),
('inherited', False),
('names', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# In base command class Lister in cliff, abstract method take_action()
# returns a tuple containing the column names and an iterable
# containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_user.assert_called_with(
name_or_id=self.user.name, ignore_missing=False, domain_id=None
)
self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None,
user_id=self.user.id,
group_id=None,
scope_project_id=None,
scope_domain_id=None,
scope_system=None,
effective=None,
include_names=None,
inherited_to=None,
)
self.assertEqual(self.columns, columns)
datalist = (
(
self.role.id,
self.user.id,
'',
'',
self.domain.id,
'',
False,
),
(
self.role.id,
self.user.id,
'',
self.project.id,
'',
'',
False,
),
)
self.assertEqual(datalist, tuple(data))
def test_role_assignment_list_user_with_domain(self):
self.identity_sdk_client.role_assignments.return_value = [
self.assignment_with_domain_id_and_user_id,
self.assignment_with_project_id_and_user_id,
]
arglist = ['--user', self.user.name, '--user-domain', self.domain.name]
verifylist = [
('user', self.user.name),
('user_domain', self.domain.name),
('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
@@ -181,6 +249,14 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
# containing the data to be listed. # containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_domain.assert_called_with(
name_or_id=self.domain.name, ignore_missing=False
)
self.identity_sdk_client.find_user.assert_called_with(
name_or_id=self.user.name,
ignore_missing=False,
domain_id=self.domain.id,
)
self.identity_sdk_client.role_assignments.assert_called_with( self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None, role_id=None,
user_id=self.user.id, user_id=self.user.id,
@@ -230,10 +306,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--user', self.user.id] arglist = ['--user', self.user.id]
verifylist = [ verifylist = [
('user', self.user.id), ('user', self.user.id),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -290,10 +369,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--group', self.group.name] arglist = ['--group', self.group.name]
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', self.group.name), ('group', self.group.name),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -306,6 +388,85 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
# containing the data to be listed. # containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_group.assert_called_with(
name_or_id=self.group.name, ignore_missing=False, domain_id=None
)
self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None,
user_id=None,
group_id=self.group.id,
scope_project_id=None,
scope_domain_id=None,
scope_system=None,
effective=None,
include_names=None,
inherited_to=None,
)
self.assertEqual(self.columns, columns)
datalist = (
(
self.role.id,
'',
self.group.id,
'',
self.domain.id,
'',
False,
),
(
self.role.id,
'',
self.group.id,
self.project.id,
'',
'',
False,
),
)
self.assertEqual(datalist, tuple(data))
def test_role_assignment_list_group_with_domain(self):
self.identity_sdk_client.role_assignments.return_value = [
self.assignment_with_domain_id_and_group_id,
self.assignment_with_project_id_and_group_id,
]
arglist = [
'--group',
self.group.name,
'--group-domain',
self.domain.name,
]
verifylist = [
('user', None),
('user_domain', None),
('group', self.group.name),
('group_domain', self.domain.name),
('system', None),
('domain', None),
('project', None),
('project_domain', None),
('role', None),
('effective', None),
('inherited', False),
('names', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# In base command class Lister in cliff, abstract method take_action()
# returns a tuple containing the column names and an iterable
# containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_domain.assert_called_with(
name_or_id=self.domain.name, ignore_missing=False
)
self.identity_sdk_client.find_group.assert_called_with(
name_or_id=self.group.name,
ignore_missing=False,
domain_id=self.domain.id,
)
self.identity_sdk_client.role_assignments.assert_called_with( self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None, role_id=None,
user_id=None, user_id=None,
@@ -350,10 +511,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--domain', self.domain.name] arglist = ['--domain', self.domain.name]
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', self.domain.name), ('domain', self.domain.name),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -410,10 +574,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--project', self.project.name] arglist = ['--project', self.project.name]
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', self.project.name), ('project', self.project.name),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -426,6 +593,85 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
# containing the data to be listed. # containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_project.assert_called_with(
name_or_id=self.project.name, ignore_missing=False, domain_id=None
)
self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None,
user_id=None,
group_id=None,
scope_project_id=self.project.id,
scope_domain_id=None,
scope_system=None,
effective=None,
include_names=None,
inherited_to=None,
)
self.assertEqual(self.columns, columns)
datalist = (
(
self.role.id,
self.user.id,
'',
self.project.id,
'',
'',
False,
),
(
self.role.id,
'',
self.group.id,
self.project.id,
'',
'',
False,
),
)
self.assertEqual(datalist, tuple(data))
def test_role_assignment_list_project_with_domain(self):
self.identity_sdk_client.role_assignments.return_value = [
self.assignment_with_project_id_and_user_id,
self.assignment_with_project_id_and_group_id,
]
arglist = [
'--project',
self.project.name,
'--project-domain',
self.domain.name,
]
verifylist = [
('user', None),
('user_domain', None),
('group', None),
('group_domain', None),
('system', None),
('domain', None),
('project', self.project.name),
('project_domain', self.domain.name),
('role', None),
('effective', None),
('inherited', False),
('names', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# In base command class Lister in cliff, abstract method take_action()
# returns a tuple containing the column names and an iterable
# containing the data to be listed.
columns, data = self.cmd.take_action(parsed_args)
self.identity_sdk_client.find_domain.assert_called_with(
name_or_id=self.domain.name, ignore_missing=False
)
self.identity_sdk_client.find_project.assert_called_with(
name_or_id=self.project.name,
ignore_missing=False,
domain_id=self.domain.id,
)
self.identity_sdk_client.role_assignments.assert_called_with( self.identity_sdk_client.role_assignments.assert_called_with(
role_id=None, role_id=None,
user_id=None, user_id=None,
@@ -476,10 +722,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
] ]
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -529,10 +778,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--effective'] arglist = ['--effective']
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', True), ('effective', True),
('inherited', False), ('inherited', False),
@@ -611,10 +863,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--inherited'] arglist = ['--inherited']
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', True), ('inherited', True),
@@ -707,10 +962,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
arglist = ['--names'] arglist = ['--names']
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', None), ('role', None),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),
@@ -799,10 +1057,13 @@ class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
] ]
verifylist = [ verifylist = [
('user', None), ('user', None),
('user_domain', None),
('group', None), ('group', None),
('group_domain', None),
('system', None), ('system', None),
('domain', None), ('domain', None),
('project', None), ('project', None),
('project_domain', None),
('role', role_2.name), ('role', role_2.name),
('effective', None), ('effective', None),
('inherited', False), ('inherited', False),