diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-21 19:47:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-21 19:47:29 +0000 |
| commit | ae13abc51818792dcf0fc895eaad442dd41f54d2 (patch) | |
| tree | 64ba06e7406d4172c9a577936295e051f066d13b /bin | |
| parent | dad0953ff5675831d84f9c28c7d5a93e42204233 (diff) | |
| parent | 8333a1533c201a7aead2b9e422dea13a0c9e7a97 (diff) | |
| download | nova-ae13abc51818792dcf0fc895eaad442dd41f54d2.tar.gz nova-ae13abc51818792dcf0fc895eaad442dd41f54d2.tar.xz nova-ae13abc51818792dcf0fc895eaad442dd41f54d2.zip | |
Merge "Fix nova-manage floating list (fixes bug 918804)"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 13522d770..902fbba96 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']) |