openstack/python-openstackclient
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-12-03 20:36:59 +00:00 committed by Gerrit Code Review
commit 4ed9e88078
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

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

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

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