Skip to content

Commit b90b93e

Browse files
waipengDean Troyer
authored andcommitted
Fix error with image show when image name is None
Need to bump osc-lib to 1.10.0 Closes-Bug: #1736696 Depends-On: I2aab5cc1f550848bda2b90ef7ef9a60f07b88996 Change-Id: I7420204f28d36529354e5671bd88587d9b15bb06
1 parent ee35409 commit b90b93e

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

lower-constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ openstacksdk==0.11.2
5454
os-client-config==1.28.0
5555
os-service-types==1.2.0
5656
os-testr==1.0.0
57-
osc-lib==1.8.0
57+
osc-lib==1.10.0
5858
oslo.concurrency==3.26.0
5959
oslo.config==5.2.0
6060
oslo.context==2.19.2

openstackclient/image/v2/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ def take_action(self, parsed_args):
585585
property_field='properties',
586586
)
587587

588-
data = utils.sort_items(data, parsed_args.sort)
588+
data = utils.sort_items(data, parsed_args.sort, str)
589589

590590
return (
591591
column_headers,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,8 @@ def test_image_list_sort_option(self, si_mock):
708708
)
709709
si_mock.assert_called_with(
710710
[self._image],
711-
'name:asc'
711+
'name:asc',
712+
str,
712713
)
713714
self.assertEqual(self.columns, columns)
714715
self.assertEqual(self.datalist, tuple(data))

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Babel!=2.4.0,>=2.3.4 # BSD
88
cliff!=2.9.0,>=2.8.0 # Apache-2.0
99
keystoneauth1>=3.4.0 # Apache-2.0
1010
openstacksdk>=0.11.2 # Apache-2.0
11-
osc-lib>=1.8.0 # Apache-2.0
11+
osc-lib>=1.10.0 # Apache-2.0
1212
oslo.i18n>=3.15.3 # Apache-2.0
1313
oslo.utils>=3.33.0 # Apache-2.0
1414
python-glanceclient>=2.8.0 # Apache-2.0

0 commit comments

Comments
 (0)