From b90b93e143e88a5f425e44a45f3c976c4f891407 Mon Sep 17 00:00:00 2001
From: Jake Yip <jake.yip@unimelb.edu.au>
Date: Thu, 21 Dec 2017 14:50:29 +1100
Subject: [PATCH] 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
---
lower-constraints.txt | 2 +-
openstackclient/image/v2/image.py | 2 +-
openstackclient/tests/unit/image/v2/test_image.py | 3 ++-
requirements.txt | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lower-constraints.txt b/lower-constraints.txt
index e3c160ecfd..5951937a19 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -54,7 +54,7 @@ openstacksdk==0.11.2
os-client-config==1.28.0
os-service-types==1.2.0
os-testr==1.0.0
-osc-lib==1.8.0
+osc-lib==1.10.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.19.2
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 4c7c815f22..5c7d32d4a6 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -585,7 +585,7 @@ class ListImage(command.Lister):
property_field='properties',
)
- data = utils.sort_items(data, parsed_args.sort)
+ data = utils.sort_items(data, parsed_args.sort, str)
return (
column_headers,
diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py
index b769d1f654..e7cd34c370 100644
--- a/openstackclient/tests/unit/image/v2/test_image.py
+++ b/openstackclient/tests/unit/image/v2/test_image.py
@@ -708,7 +708,8 @@ class TestImageList(TestImage):
)
si_mock.assert_called_with(
[self._image],
- 'name:asc'
+ 'name:asc',
+ str,
)
self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data))
diff --git a/requirements.txt b/requirements.txt
index c5795fd5ed..c3c1650f80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ Babel!=2.4.0,>=2.3.4 # BSD
cliff!=2.9.0,>=2.8.0 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0
openstacksdk>=0.11.2 # Apache-2.0
-osc-lib>=1.8.0 # Apache-2.0
+osc-lib>=1.10.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0