diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-24 21:45:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-24 21:45:26 +0000 |
| commit | c42b8552a89e3dea293b4cde21349fdc8a952182 (patch) | |
| tree | ef54a99491475b84812e0355c51ec3840106a524 | |
| parent | 00194b4e208cfb2be606f4d436166ccd3bc75cdc (diff) | |
| parent | b90b93e143e88a5f425e44a45f3c976c4f891407 (diff) | |
| download | python-openstackclient-c42b8552a89e3dea293b4cde21349fdc8a952182.tar.gz | |
Merge "Fix error with image show when image name is None"
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | openstackclient/image/v2/image.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/unit/image/v2/test_image.py | 3 | ||||
| -rw-r--r-- | requirements.txt | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index e3c160ec..5951937a 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 4c7c815f..5c7d32d4 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 b769d1f6..e7cd34c3 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 c5795fd5..c3c1650f 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 |