Skip to content

Commit 0069a01

Browse files
tang-chenSteve Martinelli
authored andcommitted
Support "server list" searching by both flavor name and ID.
Nova API only supports list servers searching by flavor ID. In OSC, we can support both flavor name and ID by mapping the name to ID. This patch also fix the inconsistent doc in .py and .rst files. Partial-Bug: 1521492 Change-Id: I1d1a6aa91aef4e2846745babe8382481185fa96e
1 parent cb73e78 commit 0069a01

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

doc/source/command-objects/server.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ List servers
216216
217217
.. option:: --flavor <flavor>
218218
219-
Search by flavor ID
219+
Search by flavor (name or ID)
220220
221221
.. option:: --image <image>
222222

openstackclient/compute/v2/server.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ def get_parser(self, prog_name):
712712
parser.add_argument(
713713
'--flavor',
714714
metavar='<flavor>',
715-
help=_('Search by flavor'),
715+
help=_('Search by flavor (name or ID)'),
716716
)
717717
parser.add_argument(
718718
'--image',
@@ -789,14 +789,21 @@ def take_action(self, parsed_args):
789789
parsed_args.user_domain,
790790
).id
791791

792+
# Nova only supports list servers searching by flavor ID. So if a
793+
# flavor name is given, map it to ID.
794+
flavor_id = None
795+
if parsed_args.flavor:
796+
flavor_id = utils.find_resource(compute_client.flavors,
797+
parsed_args.flavor).id
798+
792799
search_opts = {
793800
'reservation_id': parsed_args.reservation_id,
794801
'ip': parsed_args.ip,
795802
'ip6': parsed_args.ip6,
796803
'name': parsed_args.name,
797804
'instance_name': parsed_args.instance_name,
798805
'status': parsed_args.status,
799-
'flavor': parsed_args.flavor,
806+
'flavor': flavor_id,
800807
'image': parsed_args.image,
801808
'host': parsed_args.host,
802809
'tenant_id': project_id,

0 commit comments

Comments
 (0)