Merge lp:~jtran/nova/lp758975 into lp:~hudson-openstack/nova/trunk

[John Tran]

Fixes nova-manage bug. When a nova-network host has allocated floating ips *AND* some associated, the nova-manage floating list <host> would throw exception because was expecting hash with 'ec2_id' key , however, the obj returned is a sqlalchemy obj and the attr we need is 'hostname'.

[Devin Carlen (devcamcar)]

lgtm but seems wrong to be dealing with sqlalchemy objects at this layer...

review: Approve

[Ed Leafe (ed-leafe)]

Agree with Devin's comment, but fixing a bug is fixing a bug, not fixing a design...

review: Approve

[Mark Washenberger (markwash)]

This fixes the problem for me as well. But so would using ['hostname'] which seems so much more consistent. I know its just a style thing but can you fix that?

Thanks.

review: Needs Fixing

[lp:~jtran/nova/lp758975]

1115. By John Tran on 2011-06-01

fixed as per peer review to make more consistent

[John Tran (jtran)]

> This fixes the problem for me as well. But so would using ['hostname'] which
> seems so much more consistent. I know its just a style thing but can you fix
> that?
>
> Thanks.

Done.

[Mark Washenberger (markwash)]

Thanks!

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-05-25 20:58:40 +0000
+++ bin/nova-manage	2011-06-01 23:02:30 +0000
@@ -536,7 +536,7 @@
         for floating_ip in floating_ips:
             instance = None
             if floating_ip['fixed_ip']:
-                instance = floating_ip['fixed_ip']['instance']['ec2_id']
+                instance = floating_ip['fixed_ip']['instance']['hostname']
             print "%s\t%s\t%s" % (floating_ip['host'],
                                   floating_ip['address'],
                                   instance)