Identity: Migrate 'role assignment' commands to SDK
Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/913448 Change-Id: I579775d2dc4110951e934e00b51bf8d7546e207b
This commit is contained in:
ArtofBugs
parent
a79cb608b0
commit
ff4b9a1dc4
|
|
@ -14,7 +14,6 @@
|
|||
"""Identity v3 Assignment action implementations"""
|
||||
|
||||
from osc_lib.command import command
|
||||
from osc_lib import utils
|
||||
|
||||
from openstackclient.i18n import _
|
||||
from openstackclient.identity import common
|
||||
|
|
@ -100,69 +99,81 @@ class ListRoleAssignment(command.Lister):
|
|||
)
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
identity_client = self.app.client_manager.identity
|
||||
identity_client = self.app.client_manager.sdk_connection.identity
|
||||
auth_ref = self.app.client_manager.auth_ref
|
||||
|
||||
role = None
|
||||
call_kwargs = {}
|
||||
|
||||
role_id = None
|
||||
role_domain_id = None
|
||||
if parsed_args.role_domain:
|
||||
role_domain_id = common.find_domain(
|
||||
identity_client, parsed_args.role_domain
|
||||
role_domain_id = identity_client.find_domain(
|
||||
name_or_id=parsed_args.role_domain, ignore_missing=False
|
||||
).id
|
||||
if parsed_args.role:
|
||||
role = utils.find_resource(
|
||||
identity_client.roles,
|
||||
parsed_args.role,
|
||||
role_id = identity_client.find_role(
|
||||
name_or_id=parsed_args.role,
|
||||
ignore_missing=False,
|
||||
domain_id=role_domain_id,
|
||||
)
|
||||
).id
|
||||
call_kwargs['role_id'] = role_id
|
||||
|
||||
user = None
|
||||
user_id = None
|
||||
if parsed_args.user:
|
||||
user = common.find_user(
|
||||
identity_client,
|
||||
parsed_args.user,
|
||||
parsed_args.user_domain,
|
||||
)
|
||||
user_id = identity_client.find_user(
|
||||
name_or_id=parsed_args.user,
|
||||
ignore_missing=False,
|
||||
domain_id=parsed_args.user_domain,
|
||||
).id
|
||||
call_kwargs['user_id'] = user_id
|
||||
elif parsed_args.authuser:
|
||||
if auth_ref:
|
||||
user = common.find_user(identity_client, auth_ref.user_id)
|
||||
user_id = identity_client.find_user(
|
||||
name_or_id=auth_ref.user_id,
|
||||
ignore_missing=False,
|
||||
).id
|
||||
call_kwargs['user_id'] = user_id
|
||||
|
||||
system = None
|
||||
if parsed_args.system:
|
||||
system = parsed_args.system
|
||||
call_kwargs['scope_system'] = system
|
||||
|
||||
domain = None
|
||||
domain_id = None
|
||||
if parsed_args.domain:
|
||||
domain = common.find_domain(
|
||||
identity_client,
|
||||
parsed_args.domain,
|
||||
)
|
||||
domain_id = identity_client.find_domain(
|
||||
name_or_id=parsed_args.domain,
|
||||
ignore_missing=False,
|
||||
).id
|
||||
call_kwargs['scope_domain_id'] = domain_id
|
||||
|
||||
project = None
|
||||
project_id = None
|
||||
if parsed_args.project:
|
||||
project = common.find_project(
|
||||
identity_client,
|
||||
common._get_token_resource(
|
||||
project_id = identity_client.find_project(
|
||||
name_or_id=common._get_token_resource(
|
||||
identity_client, 'project', parsed_args.project
|
||||
),
|
||||
parsed_args.project_domain,
|
||||
)
|
||||
ignore_missing=False,
|
||||
domain_id=parsed_args.project_domain,
|
||||
).id
|
||||
call_kwargs['scope_project_id'] = project_id
|
||||
elif parsed_args.authproject:
|
||||
if auth_ref:
|
||||
project = common.find_project(
|
||||
identity_client, auth_ref.project_id
|
||||
)
|
||||
project_id = identity_client.find_project(
|
||||
name_or_id=auth_ref.project_id, ignore_missing=False
|
||||
).id
|
||||
call_kwargs['scope_project_id'] = project_id
|
||||
|
||||
group = None
|
||||
group_id = None
|
||||
if parsed_args.group:
|
||||
group = common.find_group(
|
||||
identity_client,
|
||||
parsed_args.group,
|
||||
parsed_args.group_domain,
|
||||
)
|
||||
group_id = identity_client.find_group(
|
||||
name_or_id=parsed_args.group,
|
||||
ignore_missing=False,
|
||||
domain_id=parsed_args.group_domain,
|
||||
).id
|
||||
call_kwargs['group_id'] = group_id
|
||||
|
||||
include_names = True if parsed_args.names else False
|
||||
effective = True if parsed_args.effective else False
|
||||
columns = (
|
||||
'Role',
|
||||
'User',
|
||||
|
|
@ -174,17 +185,19 @@ class ListRoleAssignment(command.Lister):
|
|||
)
|
||||
|
||||
inherited_to = 'projects' if parsed_args.inherited else None
|
||||
data = identity_client.role_assignments.list(
|
||||
domain=domain,
|
||||
user=user,
|
||||
group=group,
|
||||
project=project,
|
||||
system=system,
|
||||
role=role,
|
||||
effective=effective,
|
||||
os_inherit_extension_inherited_to=inherited_to,
|
||||
include_names=include_names,
|
||||
)
|
||||
|
||||
if parsed_args.effective:
|
||||
call_kwargs['effective'] = True
|
||||
if include_names:
|
||||
call_kwargs['include_names'] = True
|
||||
if inherited_to:
|
||||
call_kwargs['inherited_to'] = inherited_to
|
||||
|
||||
data = identity_client.role_assignments(**call_kwargs)
|
||||
|
||||
# Debugging
|
||||
print("Data:")
|
||||
print(data)
|
||||
|
||||
data_parsed = []
|
||||
for assignment in data:
|
||||
|
|
@ -223,12 +236,15 @@ class ListRoleAssignment(command.Lister):
|
|||
assignment.domain = ''
|
||||
assignment.project = ''
|
||||
|
||||
inherited = scope.get('OS-INHERIT:inherited_to') == 'projects'
|
||||
assignment.inherited = inherited
|
||||
if 'OS-INHERIT:inherited_to' in scope:
|
||||
is_inherited = scope['OS-INHERIT:inherited_to'] == 'projects'
|
||||
assignment.inherited = is_inherited
|
||||
else:
|
||||
assignment.inherited = False
|
||||
|
||||
del assignment.scope
|
||||
|
||||
if hasattr(assignment, 'user'):
|
||||
if assignment.user:
|
||||
if include_names:
|
||||
usr = '@'.join(
|
||||
[
|
||||
|
|
@ -240,7 +256,7 @@ class ListRoleAssignment(command.Lister):
|
|||
else:
|
||||
setattr(assignment, 'user', assignment.user['id'])
|
||||
assignment.group = ''
|
||||
elif hasattr(assignment, 'group'):
|
||||
elif assignment.group:
|
||||
if include_names:
|
||||
grp = '@'.join(
|
||||
[
|
||||
|
|
@ -256,7 +272,7 @@ class ListRoleAssignment(command.Lister):
|
|||
assignment.user = ''
|
||||
assignment.group = ''
|
||||
|
||||
if hasattr(assignment, 'role'):
|
||||
if assignment.role:
|
||||
if include_names:
|
||||
# TODO(henry-nash): If this is a domain specific role it
|
||||
# would be good show this as role@domain, although this
|
||||
|
|
@ -266,10 +282,16 @@ class ListRoleAssignment(command.Lister):
|
|||
# thing.
|
||||
setattr(assignment, 'role', assignment.role['name'])
|
||||
else:
|
||||
print("setting role to")
|
||||
print(assignment.role['id'])
|
||||
print(hasattr(assignment, 'role'))
|
||||
setattr(assignment, 'role', assignment.role['id'])
|
||||
print("role is now")
|
||||
print(assignment.role)
|
||||
else:
|
||||
assignment.role = ''
|
||||
|
||||
print(assignment)
|
||||
# Creating a tuple from data object fields
|
||||
# (including the blank ones)
|
||||
data_parsed.append(self._as_tuple(assignment))
|
||||
|
|
|
|||
|
|
@ -103,6 +103,14 @@ class IdentityTests(base.TestCase):
|
|||
'Implied Role ID',
|
||||
'Implied Role Name',
|
||||
]
|
||||
ROLE_ASSIGNMENT_LIST_HEADERS = [
|
||||
'Role',
|
||||
'User',
|
||||
'Group',
|
||||
'Project',
|
||||
'Domain',
|
||||
'Inherited',
|
||||
]
|
||||
REGISTERED_LIMIT_FIELDS = [
|
||||
'id',
|
||||
'service_id',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,210 @@
|
|||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from openstackclient.tests.functional.identity.v3 import common
|
||||
|
||||
|
||||
class RoleAssignmentTests(common.IdentityTests):
|
||||
def test_role_assignment_list_no_filters(self):
|
||||
raw_output = self.openstack('role assignment list')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_user_role_system(self):
|
||||
role_name = self._create_dummy_role()
|
||||
username = self._create_dummy_user()
|
||||
system = 'all'
|
||||
raw_output = self.openstack(
|
||||
'role add '
|
||||
'--user %(user)s '
|
||||
'--system %(system)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'user': username,
|
||||
'system': system,
|
||||
'role': role_name,
|
||||
}
|
||||
)
|
||||
self.addCleanup(
|
||||
self.openstack,
|
||||
'role remove '
|
||||
'--user %(user)s '
|
||||
'--system %(system)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'user': username,
|
||||
'system': system,
|
||||
'role': role_name,
|
||||
},
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
|
||||
raw_output = self.openstack(
|
||||
'role assignment list ' '--user %(user)s ' % {'user': username}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
raw_output = self.openstack(
|
||||
'role assignment list ' '--role %(role)s ' % {'role': role_name}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
raw_output = self.openstack(
|
||||
'role assignment list ' '--system %(system)s ' % {'system': system}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_group(self):
|
||||
role_name = self._create_dummy_role()
|
||||
group = self._create_dummy_group()
|
||||
system = 'all'
|
||||
raw_output = self.openstack(
|
||||
'role add '
|
||||
'--group %(group)s '
|
||||
'--system %(system)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'group': group,
|
||||
'system': system,
|
||||
'role': role_name,
|
||||
}
|
||||
)
|
||||
self.addCleanup(
|
||||
self.openstack,
|
||||
'role remove '
|
||||
'--group %(group)s '
|
||||
'--system %(system)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'group': group,
|
||||
'system': system,
|
||||
'role': role_name,
|
||||
},
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
raw_output = self.openstack(
|
||||
'role assignment list ' '--group %(group)s ' % {'group': group}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_domain(self):
|
||||
role_name = self._create_dummy_role()
|
||||
username = self._create_dummy_user()
|
||||
raw_output = self.openstack(
|
||||
'role add '
|
||||
'--domain %(domain)s '
|
||||
'--user %(user)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'domain': self.domain_name,
|
||||
'user': username,
|
||||
'role': role_name,
|
||||
}
|
||||
)
|
||||
self.addCleanup(
|
||||
self.openstack,
|
||||
'role remove '
|
||||
'--domain %(domain)s '
|
||||
'--user %(user)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'domain': self.domain_name,
|
||||
'user': username,
|
||||
'role': role_name,
|
||||
},
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
raw_output = self.openstack(
|
||||
'role assignment list '
|
||||
'--domain %(domain)s ' % {'domain': self.domain_name}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_project(self):
|
||||
role_name = self._create_dummy_role()
|
||||
username = self._create_dummy_user()
|
||||
raw_output = self.openstack(
|
||||
'role add '
|
||||
'--project %(project)s '
|
||||
'--user %(user)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'project': self.project_name,
|
||||
'user': username,
|
||||
'role': role_name,
|
||||
}
|
||||
)
|
||||
self.addCleanup(
|
||||
self.openstack,
|
||||
'role remove '
|
||||
'--project %(project)s '
|
||||
'--user %(user)s '
|
||||
'%(role)s'
|
||||
% {
|
||||
'project': self.project_name,
|
||||
'user': username,
|
||||
'role': role_name,
|
||||
},
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
raw_output = self.openstack(
|
||||
'role assignment list '
|
||||
'--project %(project)s ' % {'project': self.project_name}
|
||||
)
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_effective(self):
|
||||
raw_output = self.openstack('role assignment list ' '--effective')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_auth_user(self):
|
||||
raw_output = self.openstack('role assignment list ' '--auth-user')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_auth_project(self):
|
||||
raw_output = self.openstack('role assignment list ' '--auth-project')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_inherited(self):
|
||||
role_name = self._create_dummy_role()
|
||||
username = self._create_dummy_user()
|
||||
raw_output = self.openstack(
|
||||
'role add '
|
||||
'--project %(project)s '
|
||||
'--user %(user)s '
|
||||
'--inherited '
|
||||
'%(role)s'
|
||||
% {
|
||||
'project': self.project_name,
|
||||
'user': username,
|
||||
'role': role_name,
|
||||
}
|
||||
)
|
||||
self.assertEqual(0, len(raw_output))
|
||||
|
||||
raw_output = self.openstack('role assignment list --inherited')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
||||
def test_role_assignment_list_names(self):
|
||||
raw_output = self.openstack('role assignment list --names')
|
||||
items = self.parse_listing(raw_output)
|
||||
self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
|
||||
|
|
@ -14,17 +14,19 @@
|
|||
import copy
|
||||
from unittest import mock
|
||||
|
||||
from openstack.identity.v3 import domain as _domain
|
||||
from openstack.identity.v3 import group as _group
|
||||
from openstack.identity.v3 import project as _project
|
||||
from openstack.identity.v3 import role as _role
|
||||
from openstack.identity.v3 import role_assignment as _role_assignment
|
||||
from openstack.identity.v3 import user as _user
|
||||
from openstack.test import fakes as sdk_fakes
|
||||
from openstackclient.identity.v3 import role_assignment
|
||||
from openstackclient.tests.unit import fakes
|
||||
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
||||
|
||||
|
||||
class TestRoleAssignment(identity_fakes.TestIdentityv3):
|
||||
def setUp(self):
|
||||
super(TestRoleAssignment, self).setUp()
|
||||
|
||||
|
||||
class TestRoleAssignmentList(TestRoleAssignment):
|
||||
class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
|
||||
columns = (
|
||||
'Role',
|
||||
'User',
|
||||
|
|
@ -36,50 +38,79 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
)
|
||||
|
||||
def setUp(self):
|
||||
super(TestRoleAssignment, self).setUp()
|
||||
super().setUp()
|
||||
|
||||
# Get a shortcut to the UserManager Mock
|
||||
self.users_mock = self.identity_client.users
|
||||
self.users_mock.reset_mock()
|
||||
self.user = sdk_fakes.generate_fake_resource(_user.User)
|
||||
self.group = sdk_fakes.generate_fake_resource(_group.Group)
|
||||
self.domain = sdk_fakes.generate_fake_resource(_domain.Domain)
|
||||
self.project = sdk_fakes.generate_fake_resource(_project.Project)
|
||||
self.role = sdk_fakes.generate_fake_resource(_role.Role)
|
||||
self.assignment_with_project_id_and_user_id = (
|
||||
sdk_fakes.generate_fake_resource(
|
||||
resource_type=_role_assignment.RoleAssignment,
|
||||
role={'id': self.role.id},
|
||||
scope={'project': {'id': self.project.id}},
|
||||
user={'id': self.user.id},
|
||||
)
|
||||
)
|
||||
self.assignment_with_project_id_and_group_id = (
|
||||
sdk_fakes.generate_fake_resource(
|
||||
resource_type=_role_assignment.RoleAssignment,
|
||||
role={'id': self.role.id},
|
||||
scope={'project': {'id': self.project.id}},
|
||||
group={'id': self.group.id},
|
||||
)
|
||||
)
|
||||
self.assignment_with_domain_id_and_user_id = (
|
||||
sdk_fakes.generate_fake_resource(
|
||||
resource_type=_role_assignment.RoleAssignment,
|
||||
role={'id': self.role.id},
|
||||
scope={'domain': {'id': self.domain.id}},
|
||||
user={'id': self.user.id},
|
||||
)
|
||||
)
|
||||
self.assignment_with_domain_id_and_group_id = (
|
||||
sdk_fakes.generate_fake_resource(
|
||||
resource_type=_role_assignment.RoleAssignment,
|
||||
role={'id': self.role.id},
|
||||
scope={'domain': {'id': self.domain.id}},
|
||||
group={'id': self.group.id},
|
||||
)
|
||||
)
|
||||
|
||||
# Get a shortcut to the GroupManager Mock
|
||||
self.groups_mock = self.identity_client.groups
|
||||
self.groups_mock.reset_mock()
|
||||
# Debugging
|
||||
print("group")
|
||||
print(self.group)
|
||||
print("user")
|
||||
print(self.user)
|
||||
print("domain")
|
||||
print(self.domain)
|
||||
print("project")
|
||||
print(self.project)
|
||||
print("assignment_with_domain_id_and_group_id:")
|
||||
print(self.assignment_with_domain_id_and_group_id)
|
||||
print("assignment_with_domain_id_and_user_id:")
|
||||
print(self.assignment_with_domain_id_and_user_id)
|
||||
print("assignment_with_project_id_and_group_id:")
|
||||
print(self.assignment_with_project_id_and_group_id)
|
||||
print("assignment_with_project_id_and_user_id:")
|
||||
print(self.assignment_with_project_id_and_user_id)
|
||||
|
||||
# Get a shortcut to the DomainManager Mock
|
||||
self.domains_mock = self.identity_client.domains
|
||||
self.domains_mock.reset_mock()
|
||||
|
||||
# Get a shortcut to the ProjectManager Mock
|
||||
self.projects_mock = self.identity_client.projects
|
||||
self.projects_mock.reset_mock()
|
||||
|
||||
# Get a shortcut to the RoleManager Mock
|
||||
self.roles_mock = self.identity_client.roles
|
||||
self.roles_mock.reset_mock()
|
||||
|
||||
self.role_assignments_mock = self.identity_client.role_assignments
|
||||
self.role_assignments_mock.reset_mock()
|
||||
self.identity_sdk_client.find_user.return_value = self.user
|
||||
self.identity_sdk_client.find_group.return_value = self.group
|
||||
self.identity_sdk_client.find_project.return_value = self.project
|
||||
self.identity_sdk_client.find_domain.return_value = self.domain
|
||||
self.identity_sdk_client.find_role.return_value = self.role
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = role_assignment.ListRoleAssignment(self.app, None)
|
||||
|
||||
def test_role_assignment_list_no_filters(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
self.assignment_with_project_id_and_user_id,
|
||||
self.assignment_with_project_id_and_group_id,
|
||||
self.assignment_with_domain_id_and_user_id,
|
||||
self.assignment_with_domain_id_and_group_id,
|
||||
]
|
||||
|
||||
arglist = []
|
||||
|
|
@ -91,34 +122,24 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=None,
|
||||
effective=False,
|
||||
role=None,
|
||||
user=None,
|
||||
project=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
)
|
||||
self.identity_sdk_client.role_assignments.assert_called_with()
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
identity_fakes.project_id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
self.role.id,
|
||||
'',
|
||||
identity_fakes.group_id,
|
||||
identity_fakes.project_id,
|
||||
self.group.id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
|
|
@ -127,26 +148,14 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_role_assignment_list_user(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
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', identity_fakes.user_name]
|
||||
arglist = ['--user', self.user.name]
|
||||
verifylist = [
|
||||
('user', identity_fakes.user_name),
|
||||
('user', self.user.name),
|
||||
('group', None),
|
||||
('system', None),
|
||||
('domain', None),
|
||||
|
|
@ -163,34 +172,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
user=self.users_mock.get(),
|
||||
group=None,
|
||||
project=None,
|
||||
role=None,
|
||||
effective=False,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
user_id=self.user.id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
'',
|
||||
identity_fakes.domain_id,
|
||||
self.domain.id,
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
identity_fakes.project_id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
|
|
@ -199,27 +200,15 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_role_assignment_list_group(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
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', identity_fakes.group_name]
|
||||
arglist = ['--group', self.group.name]
|
||||
verifylist = [
|
||||
('user', None),
|
||||
('group', identity_fakes.group_name),
|
||||
('group', self.group.name),
|
||||
('system', None),
|
||||
('domain', None),
|
||||
('project', None),
|
||||
|
|
@ -235,34 +224,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=self.groups_mock.get(),
|
||||
effective=False,
|
||||
project=None,
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
group_id=self.group.id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
self.role.id,
|
||||
'',
|
||||
identity_fakes.group_id,
|
||||
self.group.id,
|
||||
'',
|
||||
identity_fakes.domain_id,
|
||||
self.domain.id,
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
self.role.id,
|
||||
'',
|
||||
identity_fakes.group_id,
|
||||
identity_fakes.project_id,
|
||||
self.group.id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
|
|
@ -271,29 +252,17 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_role_assignment_list_domain(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
self.assignment_with_domain_id_and_user_id,
|
||||
self.assignment_with_domain_id_and_group_id,
|
||||
]
|
||||
|
||||
arglist = ['--domain', identity_fakes.domain_name]
|
||||
arglist = ['--domain', self.domain.name]
|
||||
verifylist = [
|
||||
('user', None),
|
||||
('group', None),
|
||||
('system', None),
|
||||
('domain', identity_fakes.domain_name),
|
||||
('domain', self.domain.name),
|
||||
('project', None),
|
||||
('role', None),
|
||||
('effective', False),
|
||||
|
|
@ -307,35 +276,27 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=self.domains_mock.get(),
|
||||
system=None,
|
||||
group=None,
|
||||
effective=False,
|
||||
project=None,
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
scope_domain_id=self.domain.id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
'',
|
||||
identity_fakes.domain_id,
|
||||
self.domain.id,
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
self.role.id,
|
||||
'',
|
||||
identity_fakes.group_id,
|
||||
self.group.id,
|
||||
'',
|
||||
identity_fakes.domain_id,
|
||||
self.domain.id,
|
||||
'',
|
||||
False,
|
||||
),
|
||||
|
|
@ -343,30 +304,18 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_role_assignment_list_project(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
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', identity_fakes.project_name]
|
||||
arglist = ['--project', self.project.name]
|
||||
verifylist = [
|
||||
('user', None),
|
||||
('group', None),
|
||||
('system', None),
|
||||
('domain', None),
|
||||
('project', identity_fakes.project_name),
|
||||
('project', self.project.name),
|
||||
('role', None),
|
||||
('effective', False),
|
||||
('inherited', False),
|
||||
|
|
@ -379,34 +328,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=None,
|
||||
effective=False,
|
||||
project=self.projects_mock.get(),
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
scope_project_id=self.project.id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
identity_fakes.project_id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
self.role.id,
|
||||
'',
|
||||
identity_fakes.group_id,
|
||||
identity_fakes.project_id,
|
||||
self.group.id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
|
|
@ -416,17 +357,11 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
|
||||
def test_role_assignment_list_def_creds(self):
|
||||
auth_ref = self.app.client_manager.auth_ref = mock.Mock()
|
||||
auth_ref.project_id.return_value = identity_fakes.project_id
|
||||
auth_ref.user_id.return_value = identity_fakes.user_id
|
||||
auth_ref.project_id.return_value = self.project.id
|
||||
auth_ref.user_id.return_value = self.user.id
|
||||
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
self.assignment_with_project_id_and_user_id,
|
||||
]
|
||||
|
||||
arglist = [
|
||||
|
|
@ -453,25 +388,18 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
user=self.users_mock.get(),
|
||||
group=None,
|
||||
project=self.projects_mock.get(),
|
||||
role=None,
|
||||
effective=False,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
user_id=self.user.id,
|
||||
scope_project_id=self.project.id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
identity_fakes.project_id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
|
|
@ -480,21 +408,9 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
def test_role_assignment_list_effective(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID
|
||||
),
|
||||
loaded=True,
|
||||
),
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
self.assignment_with_project_id_and_user_id,
|
||||
self.assignment_with_domain_id_and_user_id,
|
||||
]
|
||||
|
||||
arglist = ['--effective']
|
||||
|
|
@ -516,35 +432,27 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=None,
|
||||
effective=True,
|
||||
project=None,
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
effective=True
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
datalist = (
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
identity_fakes.project_id,
|
||||
self.project.id,
|
||||
'',
|
||||
'',
|
||||
False,
|
||||
),
|
||||
(
|
||||
identity_fakes.role_id,
|
||||
identity_fakes.user_id,
|
||||
self.role.id,
|
||||
self.user.id,
|
||||
'',
|
||||
'',
|
||||
identity_fakes.domain_id,
|
||||
self.domain.id,
|
||||
'',
|
||||
False,
|
||||
),
|
||||
|
|
@ -558,7 +466,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
fake_assignment_b = copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED
|
||||
)
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
fakes.FakeResource(None, fake_assignment_a, loaded=True),
|
||||
fakes.FakeResource(None, fake_assignment_b, loaded=True),
|
||||
]
|
||||
|
|
@ -582,16 +490,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=None,
|
||||
effective=False,
|
||||
project=None,
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to='projects',
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
inherited_to='projects',
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
|
|
@ -624,7 +524,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
fake_role_assignment_b = copy.deepcopy(
|
||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES
|
||||
)
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
fakes.FakeResource(None, fake_role_assignment_a, loaded=True),
|
||||
fakes.FakeResource(None, fake_role_assignment_b, loaded=True),
|
||||
]
|
||||
|
|
@ -650,16 +550,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# correct information
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
group=None,
|
||||
effective=False,
|
||||
project=None,
|
||||
role=None,
|
||||
user=None,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=True,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
include_names=True
|
||||
)
|
||||
|
||||
collist = (
|
||||
|
|
@ -702,7 +594,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
self.assertEqual(tuple(data), datalist1)
|
||||
|
||||
def test_role_assignment_list_domain_role(self):
|
||||
self.role_assignments_mock.list.return_value = [
|
||||
self.identity_sdk_client.role_assignments.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.ASSIGNMENT_WITH_DOMAIN_ROLE),
|
||||
|
|
@ -734,16 +626,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
|||
# containing the data to be listed.
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
self.role_assignments_mock.list.assert_called_with(
|
||||
domain=None,
|
||||
system=None,
|
||||
user=None,
|
||||
group=None,
|
||||
project=None,
|
||||
role=self.roles_mock.get(),
|
||||
effective=False,
|
||||
os_inherit_extension_inherited_to=None,
|
||||
include_names=False,
|
||||
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||
role_id=self.identity_sdk_client.find_role().id,
|
||||
)
|
||||
|
||||
self.assertEqual(self.columns, columns)
|
||||
|
|
|
|||
Loading…
Reference in New Issue