openstack/python-novaclient
Code Issues Proposed changes

removed fixed_ip from v1.1 shell. Use --ip instead. Fixed up rest of other search options from last commit

Browse Source
This commit is contained in:
Chris Behrens 2011-08-11 21:41:50 -07:00
parent dcd5544133
commit 37f1958eeb
2 changed files with 8 additions and 6 deletions
novaclient
v1_0
shell.py
v1_1
shell.py

4
novaclient/v1_0/shell.py

@ -493,6 +493,10 @@ def do_list(cs, args):
'ip': args.ip,
'ip6': args.ip6,
'name': args.name,
'image': args.image,
'flavor': args.flavor,
'status': args.status,
'host': args.host,
'display_name': args.display_name}
if recurse_zones:
to_print = ['UUID', 'Name', 'Status', 'Public IP', 'Private IP']

10
novaclient/v1_1/shell.py

@ -251,11 +251,6 @@ def do_image_delete(cs, args):
image.delete()
@utils.arg('--fixed_ip',
dest='fixed_ip',
metavar='<fixed_ip>',
default=None,
help='Only match against fixed IP.')
@utils.arg('--reservation_id',
dest='reservation_id',
metavar='<reservation_id>',
@ -315,11 +310,14 @@ def do_list(cs, args):
recurse_zones = args.recurse_zones
search_opts = {
'reservation_id': args.reservation_id,
'fixed_ip': args.fixed_ip,
'recurse_zones': recurse_zones,
'ip': args.ip,
'ip6': args.ip6,
'name': args.name,
'image': args.image,
'flavor': args.flavor,
'status': args.status,
'host': args.host,
'display_name': args.display_name}
if recurse_zones: