Merge "Fix error with image show when image name is None"

Author: Zuul

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

openstackclient/image/v2/image.py

@@ -585,7 +585,7 @@ def take_action(self, parsed_args):
                 property_field='properties',
             )
 
-        data = utils.sort_items(data, parsed_args.sort)
+        data = utils.sort_items(data, parsed_args.sort, str)
 
         return (
             column_headers,

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

@@ -708,7 +708,8 @@ def test_image_list_sort_option(self, si_mock):
         )
         si_mock.assert_called_with(
             [self._image],
-            'name:asc'
+            'name:asc',
+            str,
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))

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