diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-23 18:03:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-23 18:03:43 +0000 |
| commit | f85b36f4a2ae1cb9ebb75b70e582495363ba3aa8 (patch) | |
| tree | e648a7a0b399ceb347ea26e6efd22635051d1687 | |
| parent | 0a4c8010c1b6725a266fa62ff6f9da2b6e2bf01a (diff) | |
| parent | c3a22519bcd91db227146a982bfb281092428f6c (diff) | |
| download | python-cinderclient-f85b36f4a2ae1cb9ebb75b70e582495363ba3aa8.tar.gz | |
Merge "Removes unicode 'u' response for "cinder get-capabilities""
| -rw-r--r-- | cinderclient/tests/unit/v2/fakes.py | 6 | ||||
| -rw-r--r-- | cinderclient/v2/shell.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py index ae21eeb..18aa99f 100644 --- a/cinderclient/tests/unit/v2/fakes.py +++ b/cinderclient/tests/unit/v2/fakes.py @@ -1278,9 +1278,9 @@ class FakeHTTPClient(base_client.HTTPClient): 'storage_protocol': 'iSCSI', 'properties': { 'compression': { - 'title': 'Compression', - 'description': 'Enables compression.', - 'type': 'boolean'}, + u'title': u'Compression', + u'description': u'Enables compression.', + u'type': u'boolean'}, } } ) diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py index dc2c14e..9a5d7c5 100644 --- a/cinderclient/v2/shell.py +++ b/cinderclient/v2/shell.py @@ -2375,7 +2375,8 @@ def do_get_capabilities(cs, args): prop = infos.pop('properties', None) utils.print_dict(infos, "Volume stats") - utils.print_dict(prop, "Backend properties") + utils.print_dict(prop, "Backend properties", + formatters=sorted(prop.keys())) @utils.arg('volume', |