Skip to content

Commit 9d5a7c7

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Rename column to default project id for long listing v3 user"
2 parents 8132072 + e7ec6bc commit 9d5a7c7

3 files changed

Lines changed: 45 additions & 31 deletions

File tree

‎openstackclient/identity/v3/user.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
"""Identity v3 User action implementations"""
1717

18+
import copy
1819
import logging
1920
import six
2021

@@ -220,17 +221,21 @@ def take_action(self, parsed_args):
220221

221222
# List users
222223
if parsed_args.long:
223-
columns = ('ID', 'Name', 'Project Id', 'Domain Id',
224-
'Description', 'Email', 'Enabled')
224+
columns = ['ID', 'Name', 'Default Project Id', 'Domain Id',
225+
'Description', 'Email', 'Enabled']
226+
column_headers = copy.deepcopy(columns)
227+
column_headers[2] = 'Project'
228+
column_headers[3] = 'Domain'
225229
else:
226-
columns = ('ID', 'Name')
230+
columns = ['ID', 'Name']
231+
column_headers = copy.deepcopy(columns)
227232
data = identity_client.users.list(
228233
domain=domain,
229234
group=group,
230235
)
231236

232237
return (
233-
columns,
238+
column_headers,
234239
(utils.get_item_properties(
235240
s, columns,
236241
formatters={},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
USER = {
182182
'id': user_id,
183183
'name': user_name,
184-
'project_id': project_id,
184+
'default_project_id': project_id,
185185
'email': user_email,
186186
'enabled': True,
187187
'domain_id': domain_id,

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

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,16 @@ def test_user_create_no_options(self):
102102
**kwargs
103103
)
104104

105-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
105+
collist = ('default_project_id', 'domain_id', 'email',
106+
'enabled', 'id', 'name')
106107
self.assertEqual(columns, collist)
107108
datalist = (
109+
identity_fakes.project_id,
108110
identity_fakes.domain_id,
109111
identity_fakes.user_email,
110112
True,
111113
identity_fakes.user_id,
112114
identity_fakes.user_name,
113-
identity_fakes.project_id,
114115
)
115116
self.assertEqual(data, datalist)
116117

@@ -147,15 +148,16 @@ def test_user_create_password(self):
147148
**kwargs
148149
)
149150

150-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
151+
collist = ('default_project_id', 'domain_id', 'email',
152+
'enabled', 'id', 'name')
151153
self.assertEqual(columns, collist)
152154
datalist = (
155+
identity_fakes.project_id,
153156
identity_fakes.domain_id,
154157
identity_fakes.user_email,
155158
True,
156159
identity_fakes.user_id,
157160
identity_fakes.user_name,
158-
identity_fakes.project_id,
159161
)
160162
self.assertEqual(data, datalist)
161163

@@ -195,15 +197,16 @@ def test_user_create_password_prompt(self):
195197
**kwargs
196198
)
197199

198-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
200+
collist = ('default_project_id', 'domain_id', 'email',
201+
'enabled', 'id', 'name')
199202
self.assertEqual(columns, collist)
200203
datalist = (
204+
identity_fakes.project_id,
201205
identity_fakes.domain_id,
202206
identity_fakes.user_email,
203207
True,
204208
identity_fakes.user_id,
205209
identity_fakes.user_name,
206-
identity_fakes.project_id,
207210
)
208211
self.assertEqual(data, datalist)
209212

@@ -239,15 +242,16 @@ def test_user_create_email(self):
239242
**kwargs
240243
)
241244

242-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
245+
collist = ('default_project_id', 'domain_id', 'email',
246+
'enabled', 'id', 'name')
243247
self.assertEqual(columns, collist)
244248
datalist = (
249+
identity_fakes.project_id,
245250
identity_fakes.domain_id,
246251
identity_fakes.user_email,
247252
True,
248253
identity_fakes.user_id,
249254
identity_fakes.user_name,
250-
identity_fakes.project_id,
251255
)
252256
self.assertEqual(data, datalist)
253257

@@ -260,7 +264,7 @@ def test_user_create_project(self):
260264
)
261265
# Set up to return an updated user
262266
USER_2 = copy.deepcopy(identity_fakes.USER)
263-
USER_2['project_id'] = identity_fakes.PROJECT_2['id']
267+
USER_2['default_project_id'] = identity_fakes.PROJECT_2['id']
264268
self.users_mock.create.return_value = fakes.FakeResource(
265269
None,
266270
USER_2,
@@ -298,15 +302,16 @@ def test_user_create_project(self):
298302
**kwargs
299303
)
300304

301-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
305+
collist = ('default_project_id', 'domain_id', 'email',
306+
'enabled', 'id', 'name')
302307
self.assertEqual(columns, collist)
303308
datalist = (
309+
identity_fakes.PROJECT_2['id'],
304310
identity_fakes.domain_id,
305311
identity_fakes.user_email,
306312
True,
307313
identity_fakes.user_id,
308314
identity_fakes.user_name,
309-
identity_fakes.PROJECT_2['id'],
310315
)
311316
self.assertEqual(data, datalist)
312317

@@ -342,15 +347,16 @@ def test_user_create_domain(self):
342347
**kwargs
343348
)
344349

345-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
350+
collist = ('default_project_id', 'domain_id', 'email',
351+
'enabled', 'id', 'name')
346352
self.assertEqual(columns, collist)
347353
datalist = (
354+
identity_fakes.project_id,
348355
identity_fakes.domain_id,
349356
identity_fakes.user_email,
350357
True,
351358
identity_fakes.user_id,
352359
identity_fakes.user_name,
353-
identity_fakes.project_id,
354360
)
355361
self.assertEqual(data, datalist)
356362

@@ -385,15 +391,16 @@ def test_user_create_enable(self):
385391
**kwargs
386392
)
387393

388-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
394+
collist = ('default_project_id', 'domain_id', 'email',
395+
'enabled', 'id', 'name')
389396
self.assertEqual(columns, collist)
390397
datalist = (
398+
identity_fakes.project_id,
391399
identity_fakes.domain_id,
392400
identity_fakes.user_email,
393401
True,
394402
identity_fakes.user_id,
395403
identity_fakes.user_name,
396-
identity_fakes.project_id,
397404
)
398405
self.assertEqual(data, datalist)
399406

@@ -427,15 +434,16 @@ def test_user_create_disable(self):
427434
**kwargs
428435
)
429436

430-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
437+
collist = ('default_project_id', 'domain_id', 'email',
438+
'enabled', 'id', 'name')
431439
self.assertEqual(columns, collist)
432440
datalist = (
441+
identity_fakes.project_id,
433442
identity_fakes.domain_id,
434443
identity_fakes.user_email,
435444
True,
436445
identity_fakes.user_id,
437446
identity_fakes.user_name,
438-
identity_fakes.project_id,
439447
)
440448
self.assertEqual(data, datalist)
441449

@@ -524,7 +532,7 @@ def test_user_list_no_options(self):
524532
**kwargs
525533
)
526534

527-
collist = ('ID', 'Name')
535+
collist = ['ID', 'Name']
528536
self.assertEqual(columns, collist)
529537
datalist = ((
530538
identity_fakes.user_id,
@@ -554,7 +562,7 @@ def test_user_list_domain(self):
554562
**kwargs
555563
)
556564

557-
collist = ('ID', 'Name')
565+
collist = ['ID', 'Name']
558566
self.assertEqual(columns, collist)
559567
datalist = ((
560568
identity_fakes.user_id,
@@ -584,7 +592,7 @@ def test_user_list_group(self):
584592
**kwargs
585593
)
586594

587-
collist = ('ID', 'Name')
595+
collist = ['ID', 'Name']
588596
self.assertEqual(columns, collist)
589597
datalist = ((
590598
identity_fakes.user_id,
@@ -614,15 +622,15 @@ def test_user_list_long(self):
614622
**kwargs
615623
)
616624

617-
collist = (
625+
collist = [
618626
'ID',
619627
'Name',
620-
'Project Id',
621-
'Domain Id',
628+
'Project',
629+
'Domain',
622630
'Description',
623631
'Email',
624632
'Enabled',
625-
)
633+
]
626634
self.assertEqual(columns, collist)
627635
datalist = ((
628636
identity_fakes.user_id,
@@ -1020,14 +1028,15 @@ def test_user_show(self):
10201028

10211029
self.users_mock.get.assert_called_with(identity_fakes.user_id)
10221030

1023-
collist = ('domain_id', 'email', 'enabled', 'id', 'name', 'project_id')
1031+
collist = ('default_project_id', 'domain_id', 'email',
1032+
'enabled', 'id', 'name')
10241033
self.assertEqual(columns, collist)
10251034
datalist = (
1035+
identity_fakes.project_id,
10261036
identity_fakes.domain_id,
10271037
identity_fakes.user_email,
10281038
True,
10291039
identity_fakes.user_id,
10301040
identity_fakes.user_name,
1031-
identity_fakes.project_id,
10321041
)
10331042
self.assertEqual(data, datalist)

0 commit comments

Comments
 (0)