diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-03 20:36:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-03 20:36:59 +0000 |
| commit | 4ed9e880789f2b31b877e0fc174e3b7963a8d732 (patch) | |
| tree | edeaa3b069a7dec95e86fd92dd558de4d9974f99 /openstackclient/compute | |
| parent | c39b720f00abc44de92dc3c7e09ff0f3cb9f084f (diff) | |
| parent | 106f928cb66fbfb3fb99f32b9d3e8ffdbda04d75 (diff) | |
| download | python-openstackclient-4ed9e880789f2b31b877e0fc174e3b7963a8d732.tar.gz | |
Merge "Support "server list" searching by both image name and ID."
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 42699f8d..d58ebacd 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -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, |