From 3e195610313a4450317c8f7f3e0c82053125b218 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 17 Jan 2012 12:30:59 -0600 Subject: [PATCH] Fix nova-manage floating list (fixes bug 918804) https://review.openstack.org/2922 broke nova-manage floating list * Restore db.floating_ip_get_all * Update instance display in nova-manage Change-Id: I526237401371a21eafbd9b571f9b4a17a534c1c6 --- bin/nova-manage | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 13522d77..902fbba9 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -722,12 +722,14 @@ class FloatingIpCommands(object): else: floating_ips = db.floating_ip_get_all_by_host(ctxt, host) for floating_ip in floating_ips: - instance = None - if floating_ip['fixed_ip']: - instance = floating_ip['fixed_ip']['instance']['uuid'] + instance_id = None + if floating_ip['fixed_ip_id']: + fixed_ip = db.fixed_ip_get(ctxt, floating_ip['fixed_ip_id']) + instance = db.instance_get(ctxt, fixed_ip['instance_id']) + instance_id = instance.get('uuid', "none") print "%s\t%s\t%s\t%s\t%s" % (floating_ip['project_id'], floating_ip['address'], - instance, + instance_id, floating_ip['pool'], floating_ip['interface'])