diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 16:29:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 16:29:59 +0000 |
| commit | d0790e31816628eb11152a9fb3bdc6d0d5f1962b (patch) | |
| tree | 7ae94c4d02c5eb0c5cdea0f6e430f4c338e40c6e | |
| parent | 152bff4df921fb64c9e455fd0fbee0350e75a713 (diff) | |
| parent | 4d66365bbdcf9e5f03f3b90a25ad460b45c08307 (diff) | |
| download | python-cinderclient-d0790e31816628eb11152a9fb3bdc6d0d5f1962b.tar.gz | |
Merge "Change "--sort" description in help message"2.0.1
| -rw-r--r-- | cinderclient/base.py | 1 | ||||
| -rw-r--r-- | cinderclient/v3/shell.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cinderclient/base.py b/cinderclient/base.py index 4716b7f..e1504ee 100644 --- a/cinderclient/base.py +++ b/cinderclient/base.py @@ -35,6 +35,7 @@ from cinderclient import utils SORT_DIR_VALUES = ('asc', 'desc') SORT_KEY_VALUES = ('id', 'status', 'size', 'availability_zone', 'name', 'bootable', 'created_at', 'reference') +SORT_MANAGEABLE_KEY_VALUES = ('size', 'reference') # Mapping of client keys to actual sort keys SORT_KEY_MAPPINGS = {'name': 'display_name'} # Additional sort keys for resources diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py index 383e9fb..82d7b83 100644 --- a/cinderclient/v3/shell.py +++ b/cinderclient/v3/shell.py @@ -733,7 +733,7 @@ def do_cluster_disable(cs, args): help=(('Comma-separated list of sort keys and directions in the ' 'form of <key>[:<asc|desc>]. ' 'Valid keys: %s. ' - 'Default=None.') % ', '.join(base.SORT_KEY_VALUES))) + 'Default=None.') % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES))) def do_manageable_list(cs, args): """Lists all manageable volumes.""" detailed = strutils.bool_from_string(args.detailed) @@ -1084,7 +1084,7 @@ def do_service_list(cs, args): help=(('Comma-separated list of sort keys and directions in the ' 'form of <key>[:<asc|desc>]. ' 'Valid keys: %s. ' - 'Default=None.') % ', '.join(base.SORT_KEY_VALUES))) + 'Default=None.') % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES))) def do_snapshot_manageable_list(cs, args): """Lists all manageable snapshots.""" detailed = strutils.bool_from_string(args.detailed) |