Skip to content

Commit 10aa2d9

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Add status column for "openstack image list""
2 parents 0cdfa62 + 342fd15 commit 10aa2d9

4 files changed

Lines changed: 36 additions & 20 deletions

File tree

‎openstackclient/image/v1/image.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,12 @@ def take_action(self, parsed_args):
354354
kwargs['public'] = True
355355
if parsed_args.private:
356356
kwargs['private'] = True
357-
kwargs['detailed'] = bool(parsed_args.property or parsed_args.long)
357+
# Note: We specifically need to do that below to get the 'status'
358+
# column.
359+
#
360+
# Always set kwargs['detailed'] to True, and then filter the columns
361+
# according to whether the --long option is specified or not.
362+
kwargs['detailed'] = True
358363

359364
if parsed_args.long:
360365
columns = (
@@ -382,7 +387,7 @@ def take_action(self, parsed_args):
382387
'Properties',
383388
)
384389
else:
385-
columns = ("ID", "Name")
390+
columns = ("ID", "Name", "Status")
386391
column_headers = columns
387392

388393
# List of image data received

‎openstackclient/image/v2/image.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def take_action(self, parsed_args):
417417
'Tags',
418418
)
419419
else:
420-
columns = ("ID", "Name")
420+
columns = ("ID", "Name", "Status")
421421
column_headers = columns
422422

423423
# List of image data received

‎openstackclient/tests/image/v1/test_image.py‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,17 @@ def test_image_list_no_options(self):
261261
# DisplayCommandBase.take_action() returns two tuples
262262
columns, data = self.cmd.take_action(parsed_args)
263263
self.api_mock.image_list.assert_called_with(
264-
detailed=False,
264+
detailed=True,
265265
marker=image_fakes.image_id,
266266
)
267267

268-
collist = ('ID', 'Name')
268+
collist = ('ID', 'Name', 'Status')
269269

270270
self.assertEqual(collist, columns)
271271
datalist = ((
272272
image_fakes.image_id,
273273
image_fakes.image_name,
274+
'',
274275
), )
275276
self.assertEqual(datalist, tuple(data))
276277

@@ -288,17 +289,18 @@ def test_image_list_public_option(self):
288289
# DisplayCommandBase.take_action() returns two tuples
289290
columns, data = self.cmd.take_action(parsed_args)
290291
self.api_mock.image_list.assert_called_with(
291-
detailed=False,
292+
detailed=True,
292293
public=True,
293294
marker=image_fakes.image_id,
294295
)
295296

296-
collist = ('ID', 'Name')
297+
collist = ('ID', 'Name', 'Status')
297298

298299
self.assertEqual(collist, columns)
299300
datalist = ((
300301
image_fakes.image_id,
301302
image_fakes.image_name,
303+
'',
302304
), )
303305
self.assertEqual(datalist, tuple(data))
304306

@@ -316,17 +318,18 @@ def test_image_list_private_option(self):
316318
# DisplayCommandBase.take_action() returns two tuples
317319
columns, data = self.cmd.take_action(parsed_args)
318320
self.api_mock.image_list.assert_called_with(
319-
detailed=False,
321+
detailed=True,
320322
private=True,
321323
marker=image_fakes.image_id,
322324
)
323325

324-
collist = ('ID', 'Name')
326+
collist = ('ID', 'Name', 'Status')
325327

326328
self.assertEqual(collist, columns)
327329
datalist = ((
328330
image_fakes.image_id,
329331
image_fakes.image_name,
332+
'',
330333
), )
331334
self.assertEqual(datalist, tuple(data))
332335

@@ -401,12 +404,13 @@ def test_image_list_property_option(self, sf_mock):
401404
property_field='properties',
402405
)
403406

404-
collist = ('ID', 'Name')
407+
collist = ('ID', 'Name', 'Status')
405408

406409
self.assertEqual(columns, collist)
407410
datalist = ((
408411
image_fakes.image_id,
409412
image_fakes.image_name,
413+
'',
410414
), )
411415
self.assertEqual(datalist, tuple(data))
412416

@@ -423,20 +427,21 @@ def test_image_list_sort_option(self, si_mock):
423427
# DisplayCommandBase.take_action() returns two tuples
424428
columns, data = self.cmd.take_action(parsed_args)
425429
self.api_mock.image_list.assert_called_with(
426-
detailed=False,
430+
detailed=True,
427431
marker=image_fakes.image_id,
428432
)
429433
si_mock.assert_called_with(
430434
[image_fakes.IMAGE],
431435
'name:asc'
432436
)
433437

434-
collist = ('ID', 'Name')
438+
collist = ('ID', 'Name', 'Status')
435439

436440
self.assertEqual(collist, columns)
437441
datalist = ((
438442
image_fakes.image_id,
439-
image_fakes.image_name
443+
image_fakes.image_name,
444+
'',
440445
), )
441446
self.assertEqual(datalist, tuple(data))
442447

‎openstackclient/tests/image/v2/test_image.py‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -374,12 +374,13 @@ def test_image_list_no_options(self):
374374
marker=image_fakes.image_id,
375375
)
376376

377-
collist = ('ID', 'Name')
377+
collist = ('ID', 'Name', 'Status')
378378

379379
self.assertEqual(collist, columns)
380380
datalist = ((
381381
image_fakes.image_id,
382382
image_fakes.image_name,
383+
'',
383384
), )
384385
self.assertEqual(datalist, tuple(data))
385386

@@ -402,12 +403,13 @@ def test_image_list_public_option(self):
402403
marker=image_fakes.image_id,
403404
)
404405

405-
collist = ('ID', 'Name')
406+
collist = ('ID', 'Name', 'Status')
406407

407408
self.assertEqual(collist, columns)
408409
datalist = ((
409410
image_fakes.image_id,
410411
image_fakes.image_name,
412+
'',
411413
), )
412414
self.assertEqual(datalist, tuple(data))
413415

@@ -430,12 +432,13 @@ def test_image_list_private_option(self):
430432
marker=image_fakes.image_id,
431433
)
432434

433-
collist = ('ID', 'Name')
435+
collist = ('ID', 'Name', 'Status')
434436

435437
self.assertEqual(collist, columns)
436438
datalist = ((
437439
image_fakes.image_id,
438440
image_fakes.image_name,
441+
'',
439442
), )
440443
self.assertEqual(datalist, tuple(data))
441444

@@ -458,12 +461,13 @@ def test_image_list_shared_option(self):
458461
marker=image_fakes.image_id,
459462
)
460463

461-
collist = ('ID', 'Name')
464+
collist = ('ID', 'Name', 'Status')
462465

463466
self.assertEqual(columns, collist)
464467
datalist = ((
465468
image_fakes.image_id,
466469
image_fakes.image_name,
470+
'',
467471
), )
468472
self.assertEqual(datalist, tuple(data))
469473

@@ -536,12 +540,13 @@ def test_image_list_property_option(self, sf_mock):
536540
property_field='properties',
537541
)
538542

539-
collist = ('ID', 'Name')
543+
collist = ('ID', 'Name', 'Status')
540544

541545
self.assertEqual(columns, collist)
542546
datalist = ((
543547
image_fakes.image_id,
544548
image_fakes.image_name,
549+
'',
545550
), )
546551
self.assertEqual(datalist, tuple(data))
547552

@@ -565,12 +570,13 @@ def test_image_list_sort_option(self, si_mock):
565570
'name:asc'
566571
)
567572

568-
collist = ('ID', 'Name')
573+
collist = ('ID', 'Name', 'Status')
569574

570575
self.assertEqual(collist, columns)
571576
datalist = ((
572577
image_fakes.image_id,
573-
image_fakes.image_name
578+
image_fakes.image_name,
579+
'',
574580
), )
575581
self.assertEqual(datalist, tuple(data))
576582

0 commit comments

Comments
 (0)