openstack/python-cinderclient
Code Issues Proposed changes

Merge "Eliminate function redefined pylint error"

Browse Source
This commit is contained in:
Jenkins
2017-05-25 10:40:07 +00:00
committed by Gerrit Code Review
parent 2bfd512364 8471c6cebd
commit 8cd147028f
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cinderclient/v3/shell.py
View File

@@ -92,8 +92,8 @@ RESET_STATE_RESOURCES = {'volume': utils.find_volume,
metavar='<key=value>', metavar='<key=value>',
default=None, default=None,
start_version='3.4', start_version='3.4',
help='Filters results by a image metadata key and value pair. Require ' help='Filters results by a image metadata key and value pair. '
'volume api version >=3.4. Default=None.') 'Require volume api version >=3.4. Default=None.')
@utils.arg('--marker', @utils.arg('--marker',
metavar='<marker>', metavar='<marker>',
default=None, default=None,
@@ -234,6 +234,7 @@ def do_reset_state(cs, args):
entity and may not match the actual state. This can render a entity entity and may not match the actual state. This can render a entity
unusable in the case of changing to the 'available' state. unusable in the case of changing to the 'available' state.
""" """
# pylint: disable=function-redefined
failure_count = 0 failure_count = 0
single = (len(args.entity) == 1) single = (len(args.entity) == 1)
@@ -533,7 +534,7 @@ def do_group_type_delete(cs, args):
gtype = shell_utils.find_group_type(cs, group_type) gtype = shell_utils.find_group_type(cs, group_type)
cs.group_types.delete(gtype) cs.group_types.delete(gtype)
print("Request to delete group type %s has been accepted." print("Request to delete group type %s has been accepted."
% (group_type)) % group_type)
except Exception as e: except Exception as e:
failure_count += 1 failure_count += 1
print("Delete for group type %s failed: %s" % (group_type, e)) print("Delete for group type %s failed: %s" % (group_type, e))
@@ -798,9 +799,11 @@ def do_cluster_disable(cs, args):
help=(('Comma-separated list of sort keys and directions in the ' help=(('Comma-separated list of sort keys and directions in the '
'form of <key>[:<asc|desc>]. ' 'form of <key>[:<asc|desc>]. '
'Valid keys: %s. ' 'Valid keys: %s. '
'Default=None.') % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES))) 'Default=None.'
) % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES)))
def do_manageable_list(cs, args): def do_manageable_list(cs, args):
"""Lists all manageable volumes.""" """Lists all manageable volumes."""
# pylint: disable=function-redefined
detailed = strutils.bool_from_string(args.detailed) detailed = strutils.bool_from_string(args.detailed)
volumes = cs.volumes.list_manageable(host=args.host, detailed=detailed, volumes = cs.volumes.list_manageable(host=args.host, detailed=detailed,
marker=args.marker, limit=args.limit, marker=args.marker, limit=args.limit,
@@ -1150,9 +1153,11 @@ def do_service_list(cs, args):
help=(('Comma-separated list of sort keys and directions in the ' help=(('Comma-separated list of sort keys and directions in the '
'form of <key>[:<asc|desc>]. ' 'form of <key>[:<asc|desc>]. '
'Valid keys: %s. ' 'Valid keys: %s. '
'Default=None.') % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES))) 'Default=None.'
) % ', '.join(base.SORT_MANAGEABLE_KEY_VALUES)))
def do_snapshot_manageable_list(cs, args): def do_snapshot_manageable_list(cs, args):
"""Lists all manageable snapshots.""" """Lists all manageable snapshots."""
# pylint: disable=function-redefined
detailed = strutils.bool_from_string(args.detailed) detailed = strutils.bool_from_string(args.detailed)
snapshots = cs.volume_snapshots.list_manageable(host=args.host, snapshots = cs.volume_snapshots.list_manageable(host=args.host,
detailed=detailed, detailed=detailed,
@@ -1173,6 +1178,7 @@ def do_api_version(cs, args):
response = cs.services.server_api_version() response = cs.services.server_api_version()
utils.print_list(response, columns) utils.print_list(response, columns)
@api_versions.wraps("3.3") @api_versions.wraps("3.3")
@utils.arg('--marker', @utils.arg('--marker',
metavar='<marker>', metavar='<marker>',
@@ -1274,6 +1280,7 @@ def do_message_delete(cs, args):
raise exceptions.CommandError("Unable to delete any of the specified " raise exceptions.CommandError("Unable to delete any of the specified "
"messages.") "messages.")
@utils.arg('--all-tenants', @utils.arg('--all-tenants',
dest='all_tenants', dest='all_tenants',
metavar='<0|1>', metavar='<0|1>',
@@ -1396,7 +1403,7 @@ def do_snapshot_list(cs, args):
@utils.arg('--limit', @utils.arg('--limit',
metavar='<limit>', metavar='<limit>',
default=None, default=None,
help='Maximum number of attachemnts to return. Default=None.') help='Maximum number of attachments to return. Default=None.')
@utils.arg('--sort', @utils.arg('--sort',
metavar='<key>[:<direction>]', metavar='<key>[:<direction>]',
default=None, default=None,
@@ -1584,11 +1591,11 @@ def do_version_list(cs, args):
else: else:
columns = ["Id", "Status", "Updated"] columns = ["Id", "Status", "Updated"]
print(("Client supported API versions:")) print("Client supported API versions:")
print(("Minimum version %(v)s") % print("Minimum version %(v)s" %
{'v': api_versions.MIN_VERSION}) {'v': api_versions.MIN_VERSION})
print(("Maximum version %(v)s") % print("Maximum version %(v)s" %
{'v': api_versions.MAX_VERSION}) {'v': api_versions.MAX_VERSION})
print(("\nServer supported API versions:")) print("\nServer supported API versions:")
utils.print_list(result, columns) utils.print_list(result, columns)