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:
parent
ee23995004
commit
4b354b4830
|
@ -14,7 +14,6 @@
|
||||||
"""Identity v3 Assignment action implementations"""
|
"""Identity v3 Assignment action implementations"""
|
||||||
|
|
||||||
from osc_lib.command import command
|
from osc_lib.command import command
|
||||||
from osc_lib import utils
|
|
||||||
|
|
||||||
from openstackclient.i18n import _
|
from openstackclient.i18n import _
|
||||||
from openstackclient.identity import common
|
from openstackclient.identity import common
|
||||||
|
@ -88,81 +87,122 @@ class ListRoleAssignment(command.Lister):
|
||||||
)
|
)
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
def _as_tuple(self, assignment):
|
def _as_tuple(self, assignment, include_names):
|
||||||
return (
|
label = "name" if include_names else "id"
|
||||||
assignment.role,
|
data = (
|
||||||
assignment.user,
|
assignment.role[label] if assignment.role else '',
|
||||||
assignment.group,
|
(
|
||||||
assignment.project,
|
(
|
||||||
assignment.domain,
|
assignment.user[label]
|
||||||
assignment.system,
|
+ (
|
||||||
assignment.inherited,
|
'@' + assignment.user['domain']['name']
|
||||||
|
if label == 'name'
|
||||||
|
else ''
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
if assignment.user
|
||||||
|
else ''
|
||||||
|
),
|
||||||
|
(
|
||||||
|
(
|
||||||
|
assignment.group[label]
|
||||||
|
+ (
|
||||||
|
'@' + assignment.group['domain']['name']
|
||||||
|
if label == 'name'
|
||||||
|
else ''
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if assignment.group
|
||||||
|
else ''
|
||||||
|
),
|
||||||
|
assignment.scope.get('project', {}).get(label, '')
|
||||||
|
+ (
|
||||||
|
'@' + assignment.scope['project']['domain']['name']
|
||||||
|
if assignment.scope.get('project') and label == 'name'
|
||||||
|
else ''
|
||||||
|
),
|
||||||
|
assignment.scope.get("domain", {}).get(label, ''),
|
||||||
|
'all' if assignment.scope.get("system") else '',
|
||||||
|
assignment.scope.get("OS-INHERIT:inherited_to") == 'projects',
|
||||||
|
)
|
||||||
|
return data
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
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
|
auth_ref = self.app.client_manager.auth_ref
|
||||||
|
|
||||||
role = None
|
call_kwargs = {}
|
||||||
|
|
||||||
|
role_id = None
|
||||||
role_domain_id = None
|
role_domain_id = None
|
||||||
if parsed_args.role_domain:
|
if parsed_args.role_domain:
|
||||||
role_domain_id = common.find_domain(
|
role_domain_id = identity_client.find_domain(
|
||||||
identity_client, parsed_args.role_domain
|
name_or_id=parsed_args.role_domain, ignore_missing=False
|
||||||
).id
|
).id
|
||||||
if parsed_args.role:
|
if parsed_args.role:
|
||||||
role = utils.find_resource(
|
role_id = identity_client.find_role(
|
||||||
identity_client.roles,
|
name_or_id=parsed_args.role,
|
||||||
parsed_args.role,
|
ignore_missing=False,
|
||||||
domain_id=role_domain_id,
|
domain_id=role_domain_id,
|
||||||
)
|
).id
|
||||||
|
call_kwargs['role_id'] = role_id
|
||||||
|
|
||||||
user = None
|
user_id = None
|
||||||
if parsed_args.user:
|
if parsed_args.user:
|
||||||
user = common.find_user(
|
user_id = identity_client.find_user(
|
||||||
identity_client,
|
name_or_id=parsed_args.user,
|
||||||
parsed_args.user,
|
ignore_missing=False,
|
||||||
parsed_args.user_domain,
|
domain_id=parsed_args.user_domain,
|
||||||
)
|
).id
|
||||||
|
call_kwargs['user_id'] = user_id
|
||||||
elif parsed_args.authuser:
|
elif parsed_args.authuser:
|
||||||
if auth_ref:
|
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
|
system = None
|
||||||
if parsed_args.system:
|
if parsed_args.system:
|
||||||
system = parsed_args.system
|
system = parsed_args.system
|
||||||
|
call_kwargs['scope_system'] = system
|
||||||
|
|
||||||
domain = None
|
domain_id = None
|
||||||
if parsed_args.domain:
|
if parsed_args.domain:
|
||||||
domain = common.find_domain(
|
domain_id = identity_client.find_domain(
|
||||||
identity_client,
|
name_or_id=parsed_args.domain,
|
||||||
parsed_args.domain,
|
ignore_missing=False,
|
||||||
)
|
).id
|
||||||
|
call_kwargs['scope_domain_id'] = domain_id
|
||||||
|
|
||||||
project = None
|
project_id = None
|
||||||
if parsed_args.project:
|
if parsed_args.project:
|
||||||
project = common.find_project(
|
project_id = identity_client.find_project(
|
||||||
identity_client,
|
name_or_id=common._get_token_resource(
|
||||||
common._get_token_resource(
|
|
||||||
identity_client, 'project', parsed_args.project
|
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:
|
elif parsed_args.authproject:
|
||||||
if auth_ref:
|
if auth_ref:
|
||||||
project = common.find_project(
|
project_id = identity_client.find_project(
|
||||||
identity_client, auth_ref.project_id
|
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:
|
if parsed_args.group:
|
||||||
group = common.find_group(
|
group_id = identity_client.find_group(
|
||||||
identity_client,
|
name_or_id=parsed_args.group,
|
||||||
parsed_args.group,
|
ignore_missing=False,
|
||||||
parsed_args.group_domain,
|
domain_id=parsed_args.group_domain,
|
||||||
)
|
).id
|
||||||
|
call_kwargs['group_id'] = group_id
|
||||||
|
|
||||||
include_names = True if parsed_args.names else False
|
include_names = True if parsed_args.names else False
|
||||||
effective = True if parsed_args.effective else False
|
|
||||||
columns = (
|
columns = (
|
||||||
'Role',
|
'Role',
|
||||||
'User',
|
'User',
|
||||||
|
@ -174,104 +214,18 @@ class ListRoleAssignment(command.Lister):
|
||||||
)
|
)
|
||||||
|
|
||||||
inherited_to = 'projects' if parsed_args.inherited else None
|
inherited_to = 'projects' if parsed_args.inherited else None
|
||||||
data = identity_client.role_assignments.list(
|
|
||||||
domain=domain,
|
if parsed_args.effective:
|
||||||
user=user,
|
call_kwargs['effective'] = True
|
||||||
group=group,
|
if include_names:
|
||||||
project=project,
|
call_kwargs['include_names'] = True
|
||||||
system=system,
|
if inherited_to:
|
||||||
role=role,
|
call_kwargs['inherited_to'] = inherited_to
|
||||||
effective=effective,
|
|
||||||
os_inherit_extension_inherited_to=inherited_to,
|
data = identity_client.role_assignments(**call_kwargs)
|
||||||
include_names=include_names,
|
|
||||||
)
|
|
||||||
|
|
||||||
data_parsed = []
|
data_parsed = []
|
||||||
for assignment in data:
|
for assignment in data:
|
||||||
# Removing the extra "scope" layer in the assignment json
|
data_parsed.append(self._as_tuple(assignment, include_names))
|
||||||
scope = assignment.scope
|
|
||||||
if 'project' in scope:
|
|
||||||
if include_names:
|
|
||||||
prj = '@'.join(
|
|
||||||
[
|
|
||||||
scope['project']['name'],
|
|
||||||
scope['project']['domain']['name'],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
setattr(assignment, 'project', prj)
|
|
||||||
else:
|
|
||||||
setattr(assignment, 'project', scope['project']['id'])
|
|
||||||
assignment.domain = ''
|
|
||||||
assignment.system = ''
|
|
||||||
elif 'domain' in scope:
|
|
||||||
if include_names:
|
|
||||||
setattr(assignment, 'domain', scope['domain']['name'])
|
|
||||||
else:
|
|
||||||
setattr(assignment, 'domain', scope['domain']['id'])
|
|
||||||
assignment.project = ''
|
|
||||||
assignment.system = ''
|
|
||||||
elif 'system' in scope:
|
|
||||||
# NOTE(lbragstad): If, or when, keystone supports role
|
|
||||||
# assignments on subsets of a system, this will have to evolve
|
|
||||||
# to handle that case instead of hardcoding to the entire
|
|
||||||
# system.
|
|
||||||
setattr(assignment, 'system', 'all')
|
|
||||||
assignment.domain = ''
|
|
||||||
assignment.project = ''
|
|
||||||
else:
|
|
||||||
assignment.system = ''
|
|
||||||
assignment.domain = ''
|
|
||||||
assignment.project = ''
|
|
||||||
|
|
||||||
inherited = scope.get('OS-INHERIT:inherited_to') == 'projects'
|
|
||||||
assignment.inherited = inherited
|
|
||||||
|
|
||||||
del assignment.scope
|
|
||||||
|
|
||||||
if hasattr(assignment, 'user'):
|
|
||||||
if include_names:
|
|
||||||
usr = '@'.join(
|
|
||||||
[
|
|
||||||
assignment.user['name'],
|
|
||||||
assignment.user['domain']['name'],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
setattr(assignment, 'user', usr)
|
|
||||||
else:
|
|
||||||
setattr(assignment, 'user', assignment.user['id'])
|
|
||||||
assignment.group = ''
|
|
||||||
elif hasattr(assignment, 'group'):
|
|
||||||
if include_names:
|
|
||||||
grp = '@'.join(
|
|
||||||
[
|
|
||||||
assignment.group['name'],
|
|
||||||
assignment.group['domain']['name'],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
setattr(assignment, 'group', grp)
|
|
||||||
else:
|
|
||||||
setattr(assignment, 'group', assignment.group['id'])
|
|
||||||
assignment.user = ''
|
|
||||||
else:
|
|
||||||
assignment.user = ''
|
|
||||||
assignment.group = ''
|
|
||||||
|
|
||||||
if hasattr(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
|
|
||||||
# domain info is not yet included in the response from the
|
|
||||||
# server. Although we could get it by re-reading the role
|
|
||||||
# from the ID, let's wait until the server does the right
|
|
||||||
# thing.
|
|
||||||
setattr(assignment, 'role', assignment.role['name'])
|
|
||||||
else:
|
|
||||||
setattr(assignment, 'role', assignment.role['id'])
|
|
||||||
else:
|
|
||||||
assignment.role = ''
|
|
||||||
|
|
||||||
# Creating a tuple from data object fields
|
|
||||||
# (including the blank ones)
|
|
||||||
data_parsed.append(self._as_tuple(assignment))
|
|
||||||
|
|
||||||
return columns, tuple(data_parsed)
|
return columns, tuple(data_parsed)
|
||||||
|
|
|
@ -103,6 +103,15 @@ class IdentityTests(base.TestCase):
|
||||||
'Implied Role ID',
|
'Implied Role ID',
|
||||||
'Implied Role Name',
|
'Implied Role Name',
|
||||||
]
|
]
|
||||||
|
ROLE_ASSIGNMENT_LIST_HEADERS = [
|
||||||
|
'Role',
|
||||||
|
'User',
|
||||||
|
'Group',
|
||||||
|
'Project',
|
||||||
|
'Domain',
|
||||||
|
'System',
|
||||||
|
'Inherited',
|
||||||
|
]
|
||||||
REGISTERED_LIMIT_FIELDS = [
|
REGISTERED_LIMIT_FIELDS = [
|
||||||
'id',
|
'id',
|
||||||
'service_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)
|
|
@ -11,20 +11,20 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
import copy
|
|
||||||
from unittest import mock
|
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.identity.v3 import role_assignment
|
||||||
from openstackclient.tests.unit import fakes
|
|
||||||
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
|
||||||
|
|
||||||
|
|
||||||
class TestRoleAssignment(identity_fakes.TestIdentityv3):
|
class TestRoleAssignmentList(identity_fakes.TestIdentityv3):
|
||||||
def setUp(self):
|
|
||||||
super(TestRoleAssignment, self).setUp()
|
|
||||||
|
|
||||||
|
|
||||||
class TestRoleAssignmentList(TestRoleAssignment):
|
|
||||||
columns = (
|
columns = (
|
||||||
'Role',
|
'Role',
|
||||||
'User',
|
'User',
|
||||||
|
@ -36,50 +36,61 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
)
|
)
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestRoleAssignment, self).setUp()
|
super().setUp()
|
||||||
|
|
||||||
# Get a shortcut to the UserManager Mock
|
self.user = sdk_fakes.generate_fake_resource(_user.User)
|
||||||
self.users_mock = self.identity_client.users
|
self.group = sdk_fakes.generate_fake_resource(_group.Group)
|
||||||
self.users_mock.reset_mock()
|
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.identity_sdk_client.find_user.return_value = self.user
|
||||||
self.groups_mock = self.identity_client.groups
|
self.identity_sdk_client.find_group.return_value = self.group
|
||||||
self.groups_mock.reset_mock()
|
self.identity_sdk_client.find_project.return_value = self.project
|
||||||
|
self.identity_sdk_client.find_domain.return_value = self.domain
|
||||||
# Get a shortcut to the DomainManager Mock
|
self.identity_sdk_client.find_role.return_value = self.role
|
||||||
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()
|
|
||||||
|
|
||||||
# Get the command object to test
|
# Get the command object to test
|
||||||
self.cmd = role_assignment.ListRoleAssignment(self.app, None)
|
self.cmd = role_assignment.ListRoleAssignment(self.app, None)
|
||||||
|
|
||||||
def test_role_assignment_list_no_filters(self):
|
def test_role_assignment_list_no_filters(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_project_id_and_user_id,
|
||||||
None,
|
self.assignment_with_project_id_and_group_id,
|
||||||
copy.deepcopy(
|
self.assignment_with_domain_id_and_user_id,
|
||||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
self.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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = []
|
arglist = []
|
||||||
|
@ -91,62 +102,58 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.group_id,
|
self.group.id,
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
|
(
|
||||||
|
self.role.id,
|
||||||
|
self.user.id,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
self.domain.id,
|
||||||
|
'',
|
||||||
|
False,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
self.role.id,
|
||||||
|
'',
|
||||||
|
self.group.id,
|
||||||
|
'',
|
||||||
|
self.domain.id,
|
||||||
|
'',
|
||||||
|
False,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_user(self):
|
def test_role_assignment_list_user(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_domain_id_and_user_id,
|
||||||
None,
|
self.assignment_with_project_id_and_user_id,
|
||||||
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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--user', identity_fakes.user_name]
|
arglist = ['--user', self.user.name]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('user', identity_fakes.user_name),
|
('user', self.user.name),
|
||||||
('group', None),
|
('group', None),
|
||||||
('system', None),
|
('system', None),
|
||||||
('domain', None),
|
('domain', None),
|
||||||
|
@ -163,34 +170,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
user_id=self.user.id,
|
||||||
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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
|
@ -199,27 +198,15 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_group(self):
|
def test_role_assignment_list_group(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_domain_id_and_group_id,
|
||||||
None,
|
self.assignment_with_project_id_and_group_id,
|
||||||
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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--group', identity_fakes.group_name]
|
arglist = ['--group', self.group.name]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('user', None),
|
('user', None),
|
||||||
('group', identity_fakes.group_name),
|
('group', self.group.name),
|
||||||
('system', None),
|
('system', None),
|
||||||
('domain', None),
|
('domain', None),
|
||||||
('project', None),
|
('project', None),
|
||||||
|
@ -235,34 +222,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
group_id=self.group.id,
|
||||||
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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.group_id,
|
self.group.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.group_id,
|
self.group.id,
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
|
@ -271,29 +250,17 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_domain(self):
|
def test_role_assignment_list_domain(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_domain_id_and_user_id,
|
||||||
None,
|
self.assignment_with_domain_id_and_group_id,
|
||||||
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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--domain', identity_fakes.domain_name]
|
arglist = ['--domain', self.domain.name]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('user', None),
|
('user', None),
|
||||||
('group', None),
|
('group', None),
|
||||||
('system', None),
|
('system', None),
|
||||||
('domain', identity_fakes.domain_name),
|
('domain', self.domain.name),
|
||||||
('project', None),
|
('project', None),
|
||||||
('role', None),
|
('role', None),
|
||||||
('effective', False),
|
('effective', False),
|
||||||
|
@ -307,35 +274,27 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=self.domains_mock.get(),
|
scope_domain_id=self.domain.id,
|
||||||
system=None,
|
|
||||||
group=None,
|
|
||||||
effective=False,
|
|
||||||
project=None,
|
|
||||||
role=None,
|
|
||||||
user=None,
|
|
||||||
os_inherit_extension_inherited_to=None,
|
|
||||||
include_names=False,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
self.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.group_id,
|
self.group.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
|
@ -343,30 +302,18 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_project(self):
|
def test_role_assignment_list_project(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_project_id_and_user_id,
|
||||||
None,
|
self.assignment_with_project_id_and_group_id,
|
||||||
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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--project', identity_fakes.project_name]
|
arglist = ['--project', self.project.name]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('user', None),
|
('user', None),
|
||||||
('group', None),
|
('group', None),
|
||||||
('system', None),
|
('system', None),
|
||||||
('domain', None),
|
('domain', None),
|
||||||
('project', identity_fakes.project_name),
|
('project', self.project.name),
|
||||||
('role', None),
|
('role', None),
|
||||||
('effective', False),
|
('effective', False),
|
||||||
('inherited', False),
|
('inherited', False),
|
||||||
|
@ -379,34 +326,26 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
scope_project_id=self.project.id,
|
||||||
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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.group_id,
|
self.group.id,
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
|
@ -416,17 +355,11 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
|
|
||||||
def test_role_assignment_list_def_creds(self):
|
def test_role_assignment_list_def_creds(self):
|
||||||
auth_ref = self.app.client_manager.auth_ref = mock.Mock()
|
auth_ref = self.app.client_manager.auth_ref = mock.Mock()
|
||||||
auth_ref.project_id.return_value = identity_fakes.project_id
|
auth_ref.project_id.return_value = self.project.id
|
||||||
auth_ref.user_id.return_value = identity_fakes.user_id
|
auth_ref.user_id.return_value = self.user.id
|
||||||
|
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_project_id_and_user_id,
|
||||||
None,
|
|
||||||
copy.deepcopy(
|
|
||||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID
|
|
||||||
),
|
|
||||||
loaded=True,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = [
|
arglist = [
|
||||||
|
@ -453,25 +386,18 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
user_id=self.user.id,
|
||||||
system=None,
|
scope_project_id=self.project.id,
|
||||||
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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
|
@ -480,21 +406,9 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_effective(self):
|
def test_role_assignment_list_effective(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
fakes.FakeResource(
|
self.assignment_with_project_id_and_user_id,
|
||||||
None,
|
self.assignment_with_domain_id_and_user_id,
|
||||||
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,
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--effective']
|
arglist = ['--effective']
|
||||||
|
@ -516,35 +430,27 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
effective=True
|
||||||
system=None,
|
|
||||||
group=None,
|
|
||||||
effective=True,
|
|
||||||
project=None,
|
|
||||||
role=None,
|
|
||||||
user=None,
|
|
||||||
os_inherit_extension_inherited_to=None,
|
|
||||||
include_names=False,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
self.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
|
@ -552,15 +458,31 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(tuple(data), datalist)
|
self.assertEqual(tuple(data), datalist)
|
||||||
|
|
||||||
def test_role_assignment_list_inherited(self):
|
def test_role_assignment_list_inherited(self):
|
||||||
fake_assignment_a = copy.deepcopy(
|
assignment_with_project_id_and_user_id_inherited = (
|
||||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INHERITED
|
sdk_fakes.generate_fake_resource(
|
||||||
|
resource_type=_role_assignment.RoleAssignment,
|
||||||
|
role={'id': self.role.id},
|
||||||
|
scope={
|
||||||
|
'project': {'id': self.project.id},
|
||||||
|
'OS-INHERIT:inherited_to': 'projects',
|
||||||
|
},
|
||||||
|
user={'id': self.user.id},
|
||||||
)
|
)
|
||||||
fake_assignment_b = copy.deepcopy(
|
|
||||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED
|
|
||||||
)
|
)
|
||||||
self.role_assignments_mock.list.return_value = [
|
assignment_with_domain_id_and_group_id_inherited = (
|
||||||
fakes.FakeResource(None, fake_assignment_a, loaded=True),
|
sdk_fakes.generate_fake_resource(
|
||||||
fakes.FakeResource(None, fake_assignment_b, loaded=True),
|
resource_type=_role_assignment.RoleAssignment,
|
||||||
|
role={'id': self.role.id},
|
||||||
|
scope={
|
||||||
|
'domain': {'id': self.domain.id},
|
||||||
|
'OS-INHERIT:inherited_to': 'projects',
|
||||||
|
},
|
||||||
|
group={'id': self.group.id},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
|
assignment_with_project_id_and_user_id_inherited,
|
||||||
|
assignment_with_domain_id_and_group_id_inherited,
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--inherited']
|
arglist = ['--inherited']
|
||||||
|
@ -582,35 +504,27 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
inherited_to='projects',
|
||||||
system=None,
|
|
||||||
group=None,
|
|
||||||
effective=False,
|
|
||||||
project=None,
|
|
||||||
role=None,
|
|
||||||
user=None,
|
|
||||||
os_inherit_extension_inherited_to='projects',
|
|
||||||
include_names=False,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
self.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.project_id,
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
True,
|
True,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_id,
|
self.role.id,
|
||||||
identity_fakes.user_id,
|
|
||||||
'',
|
'',
|
||||||
|
self.group.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
self.domain.id,
|
||||||
'',
|
'',
|
||||||
True,
|
True,
|
||||||
),
|
),
|
||||||
|
@ -618,15 +532,45 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
|
|
||||||
def test_role_assignment_list_include_names(self):
|
def test_role_assignment_list_include_names(self):
|
||||||
fake_role_assignment_a = copy.deepcopy(
|
assignment_with_project_id_and_user_id_include_names = (
|
||||||
identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES
|
sdk_fakes.generate_fake_resource(
|
||||||
|
resource_type=_role_assignment.RoleAssignment,
|
||||||
|
role={'id': self.role.id, 'name': self.role.name},
|
||||||
|
scope={
|
||||||
|
'project': {
|
||||||
|
'domain': {
|
||||||
|
'id': self.domain.id,
|
||||||
|
'name': self.domain.name,
|
||||||
|
},
|
||||||
|
'id': self.project.id,
|
||||||
|
'name': self.project.name,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
user={
|
||||||
|
'domain': {'id': self.domain.id, 'name': self.domain.name},
|
||||||
|
'id': self.user.id,
|
||||||
|
'name': self.user.name,
|
||||||
|
},
|
||||||
)
|
)
|
||||||
fake_role_assignment_b = copy.deepcopy(
|
|
||||||
identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES
|
|
||||||
)
|
)
|
||||||
self.role_assignments_mock.list.return_value = [
|
assignment_with_domain_id_and_group_id_include_names = (
|
||||||
fakes.FakeResource(None, fake_role_assignment_a, loaded=True),
|
sdk_fakes.generate_fake_resource(
|
||||||
fakes.FakeResource(None, fake_role_assignment_b, loaded=True),
|
resource_type=_role_assignment.RoleAssignment,
|
||||||
|
role={'id': self.role.id, 'name': self.role.name},
|
||||||
|
scope={
|
||||||
|
'domain': {'id': self.domain.id, 'name': self.domain.name}
|
||||||
|
},
|
||||||
|
group={
|
||||||
|
'domain': {'id': self.domain.id, 'name': self.domain.name},
|
||||||
|
'id': self.group.id,
|
||||||
|
'name': self.group.name,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
|
assignment_with_project_id_and_user_id_include_names,
|
||||||
|
assignment_with_domain_id_and_group_id_include_names,
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = ['--names']
|
arglist = ['--names']
|
||||||
|
@ -650,16 +594,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# correct information
|
# correct information
|
||||||
columns, data = self.cmd.take_action(parsed_args)
|
columns, data = self.cmd.take_action(parsed_args)
|
||||||
|
|
||||||
self.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
include_names=True
|
||||||
system=None,
|
|
||||||
group=None,
|
|
||||||
effective=False,
|
|
||||||
project=None,
|
|
||||||
role=None,
|
|
||||||
user=None,
|
|
||||||
os_inherit_extension_inherited_to=None,
|
|
||||||
include_names=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
collist = (
|
collist = (
|
||||||
|
@ -675,26 +611,20 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
|
|
||||||
datalist1 = (
|
datalist1 = (
|
||||||
(
|
(
|
||||||
identity_fakes.role_name,
|
self.role.name,
|
||||||
'@'.join(
|
'@'.join([self.user.name, self.domain.name]),
|
||||||
[identity_fakes.user_name, identity_fakes.domain_name]
|
|
||||||
),
|
|
||||||
'',
|
'',
|
||||||
'@'.join(
|
'@'.join([self.project.name, self.domain.name]),
|
||||||
[identity_fakes.project_name, identity_fakes.domain_name]
|
|
||||||
),
|
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
identity_fakes.role_name,
|
self.role.name,
|
||||||
'@'.join(
|
|
||||||
[identity_fakes.user_name, identity_fakes.domain_name]
|
|
||||||
),
|
|
||||||
'',
|
'',
|
||||||
|
'@'.join([self.group.name, self.domain.name]),
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_name,
|
self.domain.name,
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
|
@ -702,19 +632,31 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
self.assertEqual(tuple(data), datalist1)
|
self.assertEqual(tuple(data), datalist1)
|
||||||
|
|
||||||
def test_role_assignment_list_domain_role(self):
|
def test_role_assignment_list_domain_role(self):
|
||||||
self.role_assignments_mock.list.return_value = [
|
domain_2 = sdk_fakes.generate_fake_resource(_domain.Domain)
|
||||||
fakes.FakeResource(
|
# Create new role with same name but different domain
|
||||||
None,
|
role_2 = sdk_fakes.generate_fake_resource(
|
||||||
copy.deepcopy(identity_fakes.ASSIGNMENT_WITH_DOMAIN_ROLE),
|
resource_type=_role.Role,
|
||||||
loaded=True,
|
domain_id=domain_2.id,
|
||||||
),
|
name=self.role.name,
|
||||||
|
)
|
||||||
|
assignment_with_role_domain_2 = sdk_fakes.generate_fake_resource(
|
||||||
|
resource_type=_role_assignment.RoleAssignment,
|
||||||
|
role={'id': role_2.id, 'name': role_2.name},
|
||||||
|
scope={'project': {'id': self.project.id}},
|
||||||
|
user={'id': self.user.id},
|
||||||
|
)
|
||||||
|
|
||||||
|
self.identity_sdk_client.find_domain.return_value = domain_2
|
||||||
|
self.identity_sdk_client.find_role.return_value = role_2
|
||||||
|
self.identity_sdk_client.role_assignments.return_value = [
|
||||||
|
assignment_with_role_domain_2,
|
||||||
]
|
]
|
||||||
|
|
||||||
arglist = [
|
arglist = [
|
||||||
'--role',
|
'--role',
|
||||||
identity_fakes.ROLE_2['name'],
|
role_2.name,
|
||||||
'--role-domain',
|
'--role-domain',
|
||||||
identity_fakes.domain_name,
|
domain_2.name,
|
||||||
]
|
]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('user', None),
|
('user', None),
|
||||||
|
@ -722,7 +664,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
('system', None),
|
('system', None),
|
||||||
('domain', None),
|
('domain', None),
|
||||||
('project', None),
|
('project', None),
|
||||||
('role', identity_fakes.ROLE_2['name']),
|
('role', role_2.name),
|
||||||
('effective', False),
|
('effective', False),
|
||||||
('inherited', False),
|
('inherited', False),
|
||||||
('names', False),
|
('names', False),
|
||||||
|
@ -734,26 +676,18 @@ class TestRoleAssignmentList(TestRoleAssignment):
|
||||||
# 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.role_assignments_mock.list.assert_called_with(
|
self.identity_sdk_client.role_assignments.assert_called_with(
|
||||||
domain=None,
|
role_id=role_2.id,
|
||||||
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.assertEqual(self.columns, columns)
|
self.assertEqual(self.columns, columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
(
|
(
|
||||||
identity_fakes.ROLE_2['id'],
|
role_2.id,
|
||||||
identity_fakes.user_id,
|
self.user.id,
|
||||||
'',
|
'',
|
||||||
|
self.project.id,
|
||||||
'',
|
'',
|
||||||
identity_fakes.domain_id,
|
|
||||||
'',
|
'',
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in New Issue