diff --git a/cinderclient/base.py b/cinderclient/base.py index 4716b7fd7..e1504ee2f 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 899bcaa64..70cc98507 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 [:]. ' '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) @@ -1079,7 +1079,7 @@ def do_service_list(cs, args): help=(('Comma-separated list of sort keys and directions in the ' 'form of [:]. ' '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)