openstack/python-cinderclient
Code Issues Proposed changes

Merge "Avoid extra lookups in extra-specs-list"

Browse Source
This commit is contained in:
Jenkins
2014-08-23 15:27:05 +00:00
committed by Gerrit Code Review
parent 09422b600e 6565e275fd
commit 0c5f0a92b4
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cinderclient/v1/shell.py
View File

@@ -575,11 +575,6 @@ def _print_volume_type_list(vtypes):
utils.print_list(vtypes, ['ID', 'Name'])
def _print_type_and_extra_specs_list(vtypes):
formatters = {'extra_specs': _print_type_extra_specs}
utils.print_list(vtypes, ['ID', 'Name', 'extra_specs'], formatters)
@utils.service_type('volume')
def do_type_list(cs, args):
"""Lists available 'volume types'."""
@@ -589,9 +584,9 @@ def do_type_list(cs, args):
@utils.service_type('volume')
def do_extra_specs_list(cs, args):
"""Lists current volume types and extra specs. Admin only."""
"""Lists current volume types and extra specs."""
vtypes = cs.volume_types.list()
_print_type_and_extra_specs_list(vtypes)
utils.print_list(vtypes, ['ID', 'Name', 'extra_specs'])
@utils.arg('name',
@@ -812,13 +807,6 @@ def do_rate_limits(cs, args):
utils.print_list(limits, columns)
def _print_type_extra_specs(vol_type):
try:
return vol_type.get_keys()
except exceptions.NotFound:
return "N/A"
def _find_volume_type(cs, vtype):
"""Gets a volume type by name or ID."""
return utils.find_resource(cs.volume_types, vtype)

16
cinderclient/v2/shell.py
View File

@@ -657,11 +657,6 @@ def _print_volume_type_list(vtypes):
utils.print_list(vtypes, ['ID', 'Name'])
def _print_type_and_extra_specs_list(vtypes):
formatters = {'extra_specs': _print_type_extra_specs}
utils.print_list(vtypes, ['ID', 'Name', 'extra_specs'], formatters)
@utils.service_type('volumev2')
def do_type_list(cs, args):
"""Lists available 'volume types'."""
@@ -671,9 +666,9 @@ def do_type_list(cs, args):
@utils.service_type('volumev2')
def do_extra_specs_list(cs, args):
"""Lists current volume types and extra specs. Admin only."""
"""Lists current volume types and extra specs."""
vtypes = cs.volume_types.list()
_print_type_and_extra_specs_list(vtypes)
utils.print_list(vtypes, ['ID', 'Name', 'extra_specs'])
@utils.arg('name',
@@ -898,13 +893,6 @@ def do_rate_limits(cs, args):
utils.print_list(limits, columns)
def _print_type_extra_specs(vol_type):
try:
return vol_type.get_keys()
except exceptions.NotFound:
return "N/A"
def _find_volume_type(cs, vtype):
"""Gets a volume type by name or ID."""
return utils.find_resource(cs.volume_types, vtype)