Rename column to default project id for long listing v3 user

Previously this column was coming up as empty, since user's
have a `default project id`, not just `project id`.

Change-Id: I3d7f7eb600e9526b9c6cc2a8c5d6009b9100b1f5
This commit is contained in:
Steve Martinelli 2014-12-16 22:49:13 -05:00
parent 52d22359f1
commit e7ec6bc6e4
3 changed files with 45 additions and 31 deletions
openstackclient
identity/v3
tests/identity/v3

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

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

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