Merge lp:~itohm/nova/lp746922 into lp:~hudson-openstack/nova/trunk

[Masanori Itoh]

Add checking if the floating_ip is allocated or not before appending to result array in DescribeAddresses.

[Vish Ishaya (vishvananda)]

I don't see this as a huge issue, but since we can view all unallocated addresses with nova-manage floating list, I'm ok with this change.

review: Approve

[Devin Carlen (devcamcar)]

Good fix!

review: Approve

[Masanori Itoh (itohm)]

Hello Vish,

The reason why I want to change the current behavior is that there are several useful tools depending on DescribeAddresses to see which Elasic IPs are available for associating them to instances.
I hope the above makes sense.

Regards,
Masanori

[Devin Carlen (devcamcar)]

This appears to only change the behavior if you are using the admin account though.

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-03-30 05:59:13 +0000
+++ nova/api/ec2/cloud.py	2011-04-01 17:14:42 +0000
@@ -757,6 +757,8 @@
             iterator = db.floating_ip_get_all_by_project(context,
                                                          context.project_id)
         for floating_ip_ref in iterator:
+            if floating_ip_ref['project_id'] is None:
+                continue
             address = floating_ip_ref['address']
             ec2_id = None
             if (floating_ip_ref['fixed_ip']