diff options
| author | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-04-02 01:44:12 +0900 |
|---|---|---|
| committer | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-04-02 01:44:12 +0900 |
| commit | ec3b3d6ae97cddce490c2cbeed2f8f9241704ed1 (patch) | |
| tree | ba11a7f22d52e01ede7e7ce452f73a05cd09def8 | |
| parent | d98c61d21f3a60e3368cc723fc6764c66b8176b4 (diff) | |
| download | nova-ec3b3d6ae97cddce490c2cbeed2f8f9241704ed1.tar.gz nova-ec3b3d6ae97cddce490c2cbeed2f8f9241704ed1.tar.xz nova-ec3b3d6ae97cddce490c2cbeed2f8f9241704ed1.zip | |
Made the fix simpler.
| -rw-r--r-- | nova/api/ec2/cloud.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a6bdab808..425784e8a 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -757,20 +757,21 @@ class CloudController(object): 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 not None: - address = floating_ip_ref['address'] - ec2_id = None - if (floating_ip_ref['fixed_ip'] - and floating_ip_ref['fixed_ip']['instance']): - instance_id = floating_ip_ref['fixed_ip']['instance']['id'] - ec2_id = ec2utils.id_to_ec2_id(instance_id) - address_rv = {'public_ip': address, - 'instance_id': ec2_id} - if context.is_admin: - details = "%s (%s)" % (address_rv['instance_id'], - floating_ip_ref['project_id']) - address_rv['instance_id'] = details - addresses.append(address_rv) + if floating_ip_ref['project_id'] is None: + continue + address = floating_ip_ref['address'] + ec2_id = None + if (floating_ip_ref['fixed_ip'] + and floating_ip_ref['fixed_ip']['instance']): + instance_id = floating_ip_ref['fixed_ip']['instance']['id'] + ec2_id = ec2utils.id_to_ec2_id(instance_id) + address_rv = {'public_ip': address, + 'instance_id': ec2_id} + if context.is_admin: + details = "%s (%s)" % (address_rv['instance_id'], + floating_ip_ref['project_id']) + address_rv['instance_id'] = details + addresses.append(address_rv) return {'addressesSet': addresses} def allocate_address(self, context, **kwargs): |