openstack/python-openstackclient
Code Issues Proposed changes

Merge "Rename column to default project id for long listing v3 user"

Browse Source
This commit is contained in:
Jenkins 2015-01-02 19:11:45 +00:00 committed by Gerrit Code Review
commit 9d5a7c7c1b
3 changed files with 45 additions and 31 deletions
openstackclient
identity/v3
user.py
tests/identity/v3
fakes.pytest_user.py

13
openstackclient/identity/v3/user.py

@ -15,6 +15,7 @@
"""Identity v3 User action implementations""" """Identity v3 User action implementations"""
import copy
import logging import logging
import six import six
@ -220,17 +221,21 @@ class ListUser(lister.Lister):
# List users # List users
if parsed_args.long: if parsed_args.long:
columns = ('ID', 'Name', 'Project Id', 'Domain Id', columns = ['ID', 'Name', 'Default Project Id', 'Domain Id',
'Description', 'Email', 'Enabled') 'Description', 'Email', 'Enabled']
column_headers = copy.deepcopy(columns)
column_headers[2] = 'Project'
column_headers[3] = 'Domain'
else: else:
columns = ('ID', 'Name') columns = ['ID', 'Name']
column_headers = copy.deepcopy(columns)
data = identity_client.users.list( data = identity_client.users.list(
domain=domain, domain=domain,
group=group, group=group,
) )
return ( return (
columns, column_headers,
(utils.get_item_properties( (utils.get_item_properties(
s, columns, s, columns,
formatters={}, formatters={},

2
openstackclient/tests/identity/v3/fakes.py

@ -181,7 +181,7 @@ user_email = 'paul@applecorps.com'
USER = { USER = {
'id': user_id, 'id': user_id,
'name': user_name, 'name': user_name,
'project_id': project_id, 'default_project_id': project_id,
'email': user_email, 'email': user_email,
'enabled': True, 'enabled': True,
'domain_id': domain_id, 'domain_id': domain_id,

61
openstackclient/tests/identity/v3/test_user.py

@ -102,15 +102,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -147,15 +148,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -195,15 +197,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -239,15 +242,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -260,7 +264,7 @@ class TestUserCreate(TestUser):
) )
# Set up to return an updated user # Set up to return an updated user
USER_2 = copy.deepcopy(identity_fakes.USER) USER_2 = copy.deepcopy(identity_fakes.USER)
USER_2['project_id'] = identity_fakes.PROJECT_2['id'] USER_2['default_project_id'] = identity_fakes.PROJECT_2['id']
self.users_mock.create.return_value = fakes.FakeResource( self.users_mock.create.return_value = fakes.FakeResource(
None, None,
USER_2, USER_2,
@ -298,15 +302,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.PROJECT_2['id'],
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.PROJECT_2['id'],
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -342,15 +347,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -385,15 +391,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -427,15 +434,16 @@ class TestUserCreate(TestUser):
**kwargs **kwargs
) )
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)
@ -524,7 +532,7 @@ class TestUserList(TestUser):
**kwargs **kwargs
) )
collist = ('ID', 'Name') collist = ['ID', 'Name']
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
@ -554,7 +562,7 @@ class TestUserList(TestUser):
**kwargs **kwargs
) )
collist = ('ID', 'Name') collist = ['ID', 'Name']
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
@ -584,7 +592,7 @@ class TestUserList(TestUser):
**kwargs **kwargs
) )
collist = ('ID', 'Name') collist = ['ID', 'Name']
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
@ -614,15 +622,15 @@ class TestUserList(TestUser):
**kwargs **kwargs
) )
collist = ( collist = [
'ID', 'ID',
'Name', 'Name',
'Project Id', 'Project',
'Domain Id', 'Domain',
'Description', 'Description',
'Email', 'Email',
'Enabled', 'Enabled',
) ]
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
@ -1020,14 +1028,15 @@ class TestUserShow(TestUser):
self.users_mock.get.assert_called_with(identity_fakes.user_id) self.users_mock.get.assert_called_with(identity_fakes.user_id)
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id') collist = ('default_project_id', 'domain_id', 'email',
'enabled', 'id', 'name')
self.assertEqual(columns, collist) self.assertEqual(columns, collist)
datalist = ( datalist = (
identity_fakes.project_id,
identity_fakes.domain_id, identity_fakes.domain_id,
identity_fakes.user_email, identity_fakes.user_email,
True, True,
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(data, datalist)