openstack/python-openstackclient
Code Issues Proposed changes

Merge "Support "server list" searching by both flavor name and ID."

Browse Source
This commit is contained in:
Jenkins 2015-12-03 20:36:48 +00:00 committed by Gerrit Code Review
commit c39b720f00
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/command-objects/server.rst
View File

@ -216,7 +216,7 @@ List servers
.. option:: --flavor <flavor> .. option:: --flavor <flavor>
Search by flavor ID Search by flavor (name or ID)
.. option:: --image <image> .. option:: --image <image>

11
openstackclient/compute/v2/server.py
View File

@ -712,7 +712,7 @@ class ListServer(lister.Lister):
parser.add_argument( parser.add_argument(
'--flavor', '--flavor',
metavar='<flavor>', metavar='<flavor>',
help=_('Search by flavor'), help=_('Search by flavor (name or ID)'),
) )
parser.add_argument( parser.add_argument(
'--image', '--image',
@ -789,6 +789,13 @@ class ListServer(lister.Lister):
parsed_args.user_domain, parsed_args.user_domain,
).id ).id
# Nova only supports list servers searching by flavor ID. So if a
# flavor name is given, map it to ID.
flavor_id = None
if parsed_args.flavor:
flavor_id = utils.find_resource(compute_client.flavors,
parsed_args.flavor).id
search_opts = { search_opts = {
'reservation_id': parsed_args.reservation_id, 'reservation_id': parsed_args.reservation_id,
'ip': parsed_args.ip, 'ip': parsed_args.ip,
@ -796,7 +803,7 @@ class ListServer(lister.Lister):
'name': parsed_args.name, 'name': parsed_args.name,
'instance_name': parsed_args.instance_name, 'instance_name': parsed_args.instance_name,
'status': parsed_args.status, 'status': parsed_args.status,
'flavor': parsed_args.flavor, 'flavor': flavor_id,
'image': parsed_args.image, 'image': parsed_args.image,
'host': parsed_args.host, 'host': parsed_args.host,
'tenant_id': project_id, 'tenant_id': project_id,